git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ebea38
5b37649
)
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 29 Jan 2013 19:03:20 +0000
(14:03 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 29 Jan 2013 19:03:20 +0000
(14:03 -0500)
Conflicts:
drivers/net/wireless/ti/wlcore/main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff