[WATCHDOG] Merge code clean-up's from Alan Cox.

Browse source

Merge branch 'alan' of ../linux-2.6-watchdog-mm
Fixed Conflicts in the following files:
	drivers/watchdog/booke_wdt.c
	drivers/watchdog/mpc5200_wdt.c
	drivers/watchdog/sc1200wdt.c

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

...

This commit is contained in:

Wim Van Sebroeck 2008-08-06 11:58:26 +00:00

parent 0967d61ea0 7c4be5aa8d

commit 96e2e6fafa

57 changed files with 2963 additions and 2930 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

119

drivers/watchdog/acquirewdt.c

View file

135

drivers/watchdog/advantechwdt.c

View file

184

drivers/watchdog/alim1535_wdt.c

View file

224

drivers/watchdog/alim7101_wdt.c

View file

7

drivers/watchdog/at32ap700x_wdt.c

View file

108

drivers/watchdog/at91rm9200_wdt.c

View file

141

drivers/watchdog/bfin_wdt.c

View file

26

drivers/watchdog/booke_wdt.c

View file

148

drivers/watchdog/cpu5wdt.c

View file

11

drivers/watchdog/davinci_wdt.c

View file

17

drivers/watchdog/ep93xx_wdt.c

View file

57

drivers/watchdog/eurotechwdt.c

View file

4

drivers/watchdog/hpwdt.c

View file

338

drivers/watchdog/i6300esb.c

View file

15

drivers/watchdog/iTCO_vendor.h

View file

53

drivers/watchdog/iTCO_vendor_support.c

View file

300

drivers/watchdog/iTCO_wdt.c

View file

103

drivers/watchdog/ib700wdt.c

View file

151

drivers/watchdog/ibmasr.c

View file

114

drivers/watchdog/indydog.c

View file

46

drivers/watchdog/iop_wdt.c

View file

50

drivers/watchdog/ixp2000_wdt.c

View file

41

drivers/watchdog/ixp4xx_wdt.c

View file

119

drivers/watchdog/ks8695_wdt.c

View file

108

drivers/watchdog/machzwd.c

View file

133

drivers/watchdog/mixcomwd.c

View file

18

drivers/watchdog/mpc5200_wdt.c

View file

19

drivers/watchdog/mpc83xx_wdt.c

View file

37

drivers/watchdog/mpc8xx_wdt.c

View file

53

drivers/watchdog/mpcore_wdt.c

View file

113

drivers/watchdog/mtx-1_wdt.c

View file

20

drivers/watchdog/mv64x60_wdt.c

View file

35

drivers/watchdog/omap_wdt.c

View file

211

drivers/watchdog/pc87413_wdt.c

View file

179

drivers/watchdog/pcwd.c

View file

18

drivers/watchdog/pnx4008_wdt.c

View file

21

drivers/watchdog/rm9k_wdt.c

View file

32

drivers/watchdog/sa1100_wdt.c

View file

78

drivers/watchdog/sb_wdog.c

View file

223

drivers/watchdog/sbc60xxwdt.c

View file

16

drivers/watchdog/sbc7240_wdt.c

View file

30

drivers/watchdog/sbc8360.c

View file

12

drivers/watchdog/sbc_epx_c3.c

View file

165

drivers/watchdog/sc520_wdt.c

View file

59

drivers/watchdog/scx200_wdt.c

View file

133

drivers/watchdog/shwdt.c

View file

442

drivers/watchdog/smsc37b787_wdt.c

View file

87

drivers/watchdog/softdog.c

View file

31

drivers/watchdog/txx9wdt.c

View file

175

drivers/watchdog/w83627hf_wdt.c

View file

148

drivers/watchdog/w83697hf_wdt.c

View file

201

drivers/watchdog/w83877f_wdt.c

View file

225

drivers/watchdog/w83977f_wdt.c

View file

80

drivers/watchdog/wafer5823wdt.c

View file

103

drivers/watchdog/wdrtas.c

View file

31

drivers/watchdog/wdt285.c

View file

148

drivers/watchdog/wdt977.c

View file