git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91fbe33
b5abcf0
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Wed, 18 Apr 2012 18:17:13 +0000
(14:17 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 18 Apr 2012 18:27:48 +0000
(14:27 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
net/nfc/netlink.c
net/wireless/nl80211.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff