git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4153577
9e97d14
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Mon, 18 Feb 2013 18:47:13 +0000
(13:47 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 18 Feb 2013 18:47:13 +0000
(13:47 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/ti/wlcore/sdio.c
drivers/net/wireless/ti/wlcore/spi.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff