git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f404c2f
f435d9e
)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
author
David S. Miller
<davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000
(09:50 -0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 10 Dec 2010 17:50:47 +0000
(09:50 -0800)
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff