leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ac0f6f927d
linux/drivers/watchdog
History
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
acquirewdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
advantechwdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
adx_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
alim1535_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
alim7101_wdt.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
ar7_wdt.c MIPS: AR7: Implement clock API 2010-02-27 12:53:16 +01:00
at32ap700x_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
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
bcm47xx_wdt.c [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons 2009-07-09 18:29:06 +00:00
bfin_wdt.c [WATCHDOG] bfin: fix max timeout calculation 2010-02-21 19:16:30 +00:00
booke_wdt.c [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in seconds 2009-09-18 08:37:21 +00:00
coh901327_wdt.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
cpu5wdt.c
cpwd.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
davinci_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
ep93xx_wdt.c [ARM] 5606/1: Fix ep93xx watchdog driver headers 2009-07-17 13:33:25 +01:00
eurotechwdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
gef_wdt.c
geodewdt.c watchdog: update geodewdt for new MFGPT API 2009-12-18 10:19:57 -08:00
hpwdt.c [WATCHDOG] hpwdt: Add NMI priority option 2009-06-23 07:13:45 +00:00
i6300esb.c [WATCHDOG] i6300esb.c: Restructure initialization of the device 2009-04-08 06:06:50 +00:00
ib700wdt.c
ibmasr.c
indydog.c [WATCHDOG] Correct WDIOF_MAGICCLOSE flag 2009-06-18 07:30:57 +00:00
iop_wdt.c [WATCHDOG] sizeof cleanup 2009-09-18 08:39:37 +00:00
it87_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
it8712f_wdt.c [WATCHDOG] Correct WDIOF_MAGICCLOSE flag 2009-06-18 07:30:57 +00:00
iTCO_vendor_support.c [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue. 2009-06-18 07:31:58 +00:00
iTCO_vendor.h
iTCO_wdt.c [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs 2010-01-18 21:39:49 +00:00
ixp4xx_wdt.c
ixp2000_wdt.c [WATCHDOG] ixp2000: Fix build failure caused by missing include 2010-01-19 20:43:19 +00:00
Kconfig [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique. 2010-01-25 19:48:49 +00:00
ks8695_wdt.c ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers 2009-08-05 22:06:56 +01:00
machzwd.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
Makefile MIPS: eXcite: Remove platform. 2009-12-17 01:57:35 +00:00
mixcomwd.c
mpc8xxx_wdt.c
mpcore_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +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 [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
nuc900_wdt.c [WATCHDOG] Add watchdog driver for NUC900 2009-09-18 08:35:07 +00:00
omap_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
omap_wdt.h
orion_wdt.c [ARM] Orion/Kirkwood: rename orion5x_wdt to orion_wdt 2009-06-08 13:05:00 -04:00
pc87413_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
pcwd_pci.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
pcwd_usb.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
pcwd.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
pika_wdt.c
pnx833x_wdt.c [WATCHDOG] Add pnx833x_wdt 2009-06-20 18:37:20 +00:00
pnx4008_wdt.c ARM: PNX4008: convert watchdog to use clk API enable/disable calls 2010-02-12 17:32:37 +00:00
rc32434_wdt.c [PATCH] rc32434_wdt: fix compilation failure 2009-12-02 12:47:24 +00:00
rdc321x_wdt.c [WATCHDOG] move platform probe and remove function to devinit and devexit 2009-06-18 07:30:44 +00:00
riowd.c watchdog: Remove BKL from rio watchdog driver 2009-11-02 21:16:28 -08:00
s3c2410_wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
sa1100_wdt.c [WATCHDOG] SA1100 watchdog maximum timeout 2009-07-09 18:29:38 +00:00
sb_wdog.c fix my email address. 2009-11-09 09:40:54 +01: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
sbc_fitpc2_wdt.c [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique. 2010-01-25 19:48:49 +00:00
sc520_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
sc1200wdt.c [WATCHDOG] sizeof cleanup 2009-09-18 08:39:37 +00:00
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 [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
softdog.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
stmp3xxx_wdt.c [WATCHDOG] Freescale STMP: watchdog driver 2009-06-20 18:40:32 +00:00
twl4030_wdt.c mfd: Rename all twl4030_i2c* 2009-12-13 21:23:33 +01:00
txx9wdt.c [WATCHDOG] use resource_size() 2009-12-23 19:53:04 +00:00
w83627hf_wdt.c [WATCHDOG] w83627hf_wdt.c: add support for the W83627EHF support 2009-07-09 18:29:45 +00:00
w83697hf_wdt.c [WATCHDOG] Some more general cleanup 2009-06-18 07:30:30 +00:00
w83697ug_wdt.c [WATCHDOG] w83697ug, fix lock imbalance 2009-07-09 18:29:16 +00:00
w83877f_wdt.c
w83977f_wdt.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
wafer5823wdt.c
wd501p.h [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
wdrtas.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
wdt285.c
wdt977.c [WATCHDOG] More coding-style and trivial clean-up 2009-03-25 09:07:04 +00:00
wdt_pci.c [WATCHDOG] wdt_pci: fix printk and variable type 2009-09-18 08:39:01 +00:00
wdt.c [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501 2009-03-25 09:08:16 +00:00
wm831x_wdt.c [WATCHDOG] Add support for WM831x watchdog 2009-09-18 08:35:49 +00:00
wm8350_wdt.c