git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca1ba7c
af2bf4b
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Mon, 22 Aug 2011 18:28:50 +0000
(14:28 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 22 Aug 2011 18:28:50 +0000
(14:28 -0400)
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff