git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55cb079
da29d2a
)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
author
John W. Linville
<linville@tuxdriver.com>
Thu, 6 Dec 2012 19:58:41 +0000
(14:58 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 6 Dec 2012 19:58:41 +0000
(14:58 -0500)
Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff