Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits)
[WATCHDOG] more coding style clean-up's
[WATCHDOG] sbc8360.c - move stop code into a function
[WATCHDOG] Coding style - Indentation - part 2
[WATCHDOG] Coding style - Indentation - part 1
[WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
[WATCHDOG] mpc8xxx_wdt: fix build
[WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
[WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
[WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
[WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
[WATCHDOG] pcwd: a couple of watchdogs escaped conversion
[WATCHDOG] Clean-up includes
[WATCHDOG] hpwdt.c - fix double includes
[WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style
[WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl
[WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl
[WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl
...