git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a90c7a3
bd39a27
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Thu, 7 Apr 2011 20:45:40 +0000
(16:45 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 7 Apr 2011 20:45:40 +0000
(16:45 -0400)
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff