git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a412ad
eaef6a9
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Thu, 5 May 2011 17:32:35 +0000
(13:32 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Thu, 5 May 2011 17:32:35 +0000
(13:32 -0400)
Conflicts:
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rtlwifi/pci.c
net/bluetooth/l2cap_sock.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff