]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b2e43a f948cc6)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 16 Sep 2008 21:11:43 +0000 (14:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Sep 2008 21:11:43 +0000 (14:11 -0700)
commit2e57572a50a4de41c6cbc879a4866a312d4cd316
treec4f58ec96c06642c4b415b881d3f0a3b673d5b44tree | snapshot
parent9b2e43ae4e9609f80034dfe8de895045cac52d77commit | diff
parentf948cc6ab9e61a8e88d70ee9aafc690e6d26f92ccommit | diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

arch/sparc64/kernel/pci_psycho.c
arch/sparc/kernel/of_device.c diff1 | diff2 | blob | history
arch/sparc64/kernel/irq.c diff1 | diff2 | blob | history
arch/sparc64/kernel/pci_psycho.c diff1 | diff2 | blob | history
arch/sparc64/kernel/prom.c diff1 | diff2 | blob | history
arch/sparc64/kernel/psycho_common.c diff1 | | blob | history
arch/sparc64/kernel/psycho_common.h diff1 | | blob | history
drivers/ata/Kconfig diff1 | diff2 | blob | history
drivers/net/niu.c diff1 | diff2 | blob | history
drivers/rtc/rtc-cmos.c diff1 | diff2 | blob | history
drivers/watchdog/Makefile diff1 | diff2 | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.