git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bdbd28
c997679
)
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
Dmitry Torokhov
<dtor@insightbb.com>
Fri, 8 Dec 2006 06:07:56 +0000
(
01:07
-0500)
committer
Dmitry Torokhov
<dtor@insightbb.com>
Fri, 8 Dec 2006 06:07:56 +0000
(
01:07
-0500)
Conflicts:
drivers/usb/input/hid.h
Trivial merge