git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f8684c
685fb72
)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
author
John W. Linville
<linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:05 +0000
(15:21 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:05 +0000
(15:21 -0400)
Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff