Linus Torvalds 773d7a09e1 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits) powerpc/5121: make clock debug output more readable powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback fbdev/xilinxfb: Fix improper casting and tighen up probe path usb/ps3: Add missing annotations powerpc: Add memory clobber to mtspr() powerpc: Fix invalid construct in our CPU selection Kconfig ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access powerpc: Add configurable -Werror for arch/powerpc of_serial: Add UPF_FIXED_TYPE flag drivers/hvc: Add missing __devexit_p() net/ps3: gelic - Add missing annotations powerpc: Introduce macro spin_event_timeout() powerpc/warp: Fix ISA_DMA_THRESHOLD default powerpc/bootwrapper: Custom build options for XPedite52xx targets powerpc/85xx: Add defconfig for X-ES MPC85xx boards powerpc/85xx: Add dts files for X-ES MPC85xx boards powerpc/85xx: Add platform support for X-ES MPC85xx boards 83xx: add support for the kmeter1 board. ...		2009-06-19 17:40:40 -07:00
..
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
Makefile	…
acquirewdt.c	…
advantechwdt.c	…
alim1535_wdt.c	…
alim7101_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
ar7_wdt.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
at32ap700x_wdt.c	…
at91rm9200_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
at91sam9_wdt.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
bfin_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
booke_wdt.c	…
cpu5wdt.c	…
cpwd.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
davinci_wdt.c	[WATCHDOG] move platform probe and remove function to devinit and devexit	2009-06-18 07:30:44 +00:00
ep93xx_wdt.c	…
eurotechwdt.c	…
gef_wdt.c	…
geodewdt.c	…
hpwdt.c	[WATCHDOG] hpwdt: Add NMI sourcing	2009-06-18 07:32:06 +00:00
i6300esb.c	…
iTCO_vendor.h	…
iTCO_vendor_support.c	[WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue.	2009-06-18 07:31:58 +00:00
iTCO_wdt.c	[WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware	2009-06-18 07:31:44 +00:00
ib700wdt.c	…
ibmasr.c	…
indydog.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
iop_wdt.c	…
it87_wdt.c	…
it8712f_wdt.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
ixp4xx_wdt.c	…
ixp2000_wdt.c	…
ks8695_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
machzwd.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
mixcomwd.c	…
mpc8xxx_wdt.c	…
mpc5200_wdt.c	powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function	2009-06-17 00:30:22 -06:00
mpcore_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
mtx-1_wdt.c	[WATCHDOG] move platform probe and remove function to devinit and devexit	2009-06-18 07:30:44 +00:00
mv64x60_wdt.c	…
omap_wdt.c	…
omap_wdt.h	…
orion_wdt.c	…
pc87413_wdt.c	…
pcwd.c	…
pcwd_pci.c	…
pcwd_usb.c	…
pika_wdt.c	…
pnx4008_wdt.c	[WATCHDOG] move platform probe and remove function to devinit and devexit	2009-06-18 07:30:44 +00:00
rc32434_wdt.c	…
rdc321x_wdt.c	[WATCHDOG] move platform probe and remove function to devinit and devexit	2009-06-18 07:30:44 +00:00
riowd.c	…
rm9k_wdt.c	[WATCHDOG] move platform probe and remove function to devinit and devexit	2009-06-18 07:30:44 +00:00
s3c2410_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
sa1100_wdt.c	…
sb_wdog.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
sbc60xxwdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
sbc7240_wdt.c	…
sbc8360.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
sbc_epx_c3.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
sc520_wdt.c	…
sc1200wdt.c	…
sch311x_wdt.c	…
scx200_wdt.c	[WATCHDOG] Correct WDIOF_MAGICCLOSE flag	2009-06-18 07:30:57 +00:00
shwdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
smsc37b787_wdt.c	…
softdog.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
txx9wdt.c	…
w83627hf_wdt.c	…
w83697hf_wdt.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
w83697ug_wdt.c	…
w83877f_wdt.c	…
w83977f_wdt.c	…
wafer5823wdt.c	…
wd501p.h	…
wdrtas.c	[WATCHDOG] Some more general cleanup	2009-06-18 07:30:30 +00:00
wdt.c	…
wdt285.c	…
wdt977.c	…
wdt_pci.c	…
wm8350_wdt.c	…