git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e5c2b4
cd87a2d
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 24 Sep 2010 19:52:34 +0000
(15:52 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 24 Sep 2010 19:52:34 +0000
(15:52 -0400)
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff