kernel_optimize_test/drivers/watchdog
Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
2009-12-08 08:15:29 -08:00
..
acquirewdt.c
advantechwdt.c
adx_wdt.c
alim1535_wdt.c
alim7101_wdt.c
ar7_wdt.c
at32ap700x_wdt.c
at91rm9200_wdt.c
at91sam9_wdt.c
bcm47xx_wdt.c
bfin_wdt.c
booke_wdt.c
coh901327_wdt.c
cpu5wdt.c
cpwd.c
davinci_wdt.c
ep93xx_wdt.c
eurotechwdt.c
gef_wdt.c
geodewdt.c
hpwdt.c
i6300esb.c
ib700wdt.c
ibmasr.c
indydog.c
iop_wdt.c
it87_wdt.c
it8712f_wdt.c
iTCO_vendor_support.c
iTCO_vendor.h
iTCO_wdt.c
ixp4xx_wdt.c
ixp2000_wdt.c
Kconfig
ks8695_wdt.c
machzwd.c
Makefile
mixcomwd.c
mpc8xxx_wdt.c
mpc5200_wdt.c
mpcore_wdt.c
mtx-1_wdt.c
mv64x60_wdt.c
nuc900_wdt.c
omap_wdt.c
omap_wdt.h
orion_wdt.c
pc87413_wdt.c
pcwd_pci.c
pcwd_usb.c
pcwd.c
pika_wdt.c
pnx833x_wdt.c
pnx4008_wdt.c
rc32434_wdt.c [PATCH] rc32434_wdt: fix compilation failure 2009-12-02 12:47:24 +00:00
rdc321x_wdt.c
riowd.c
rm9k_wdt.c
s3c2410_wdt.c
sa1100_wdt.c
sb_wdog.c
sbc60xxwdt.c
sbc7240_wdt.c
sbc8360.c
sbc_epx_c3.c
sbc_fitpc2_wdt.c
sc520_wdt.c
sc1200wdt.c
sch311x_wdt.c
scx200_wdt.c
shwdt.c
smsc37b787_wdt.c
softdog.c
stmp3xxx_wdt.c
twl4030_wdt.c
txx9wdt.c
w83627hf_wdt.c
w83697hf_wdt.c
w83697ug_wdt.c
w83877f_wdt.c
w83977f_wdt.c
wafer5823wdt.c
wd501p.h
wdrtas.c
wdt285.c
wdt977.c
wdt_pci.c
wdt.c
wm831x_wdt.c
wm8350_wdt.c