git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a0c80b8
5b664cb
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
David S. Miller
<davem@davemloft.net>
Fri, 18 Jul 2008 09:39:39 +0000
(
02:39
-0700)
committer
David S. Miller
<davem@davemloft.net>
Fri, 18 Jul 2008 09:39:39 +0000
(
02:39
-0700)
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff