git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22c5649
dcf3396
)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000
(16:00 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000
(16:00 -0400)
Conflicts:
drivers/net/wireless/mac80211_hwsim.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff