]> 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: 7a23afa 2ffbb83)
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 21 Nov 2007 02:27:29 +0000 (18:27 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 21 Nov 2007 02:27:29 +0000 (18:27 -0800)
commit99ed771ddc41977332a4bdd55e51cae115789301
treefbb224619dac7a911f0a12f71ce6b9d3d8d6a565tree | snapshot
parent7a23afa6c836ae1775ceeaef64aee96df46fd9d5commit | diff
parent2ffbb8377c7a0713baf6644e285adc27a5654582commit | diff
Merge current mainline tree into linux-omap tree

Merge branch 'linus'

Conflicts:

arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap2/clock.c
drivers/video/omap/Kconfig
net/ipv4/netfilter/Makefile
15 files changed:
Makefile diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mm/proc-arm926.S diff1 | diff2 | blob | history
arch/arm/vfp/vfpmodule.c diff1 | diff2 | blob | history
drivers/Makefile diff1 | diff2 | blob | history
drivers/hwmon/Kconfig diff1 | diff2 | blob | history
drivers/hwmon/Makefile diff1 | diff2 | blob | history
drivers/media/video/Kconfig diff1 | diff2 | blob | history
drivers/net/smc91x.h diff1 | diff2 | blob | history
drivers/rtc/Kconfig diff1 | diff2 | blob | history
drivers/video/omap/Kconfig diff1 | diff2 | blob | history
drivers/watchdog/Kconfig diff1 | diff2 | blob | history
include/asm-arm/pgtable.h diff1 | diff2 | blob | history
net/ipv4/netfilter/Kconfig diff1 | diff2 | blob | history
net/ipv4/netfilter/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.