diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-03 04:50:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-03 04:50:11 +0200 |
| commit | 5e11611a5d22252f3f9c169a3c9377eac0c32033 (patch) | |
| tree | c4cd71175afb12c63bc5a3961098321ff0546b63 /drivers/watchdog/pika_wdt.c | |
| parent | Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | ARM: 5965/1: Fix soft lockup in at91 udc driver (diff) | |
| download | linux-5e11611a5d22252f3f9c169a3c9377eac0c32033.tar.xz linux-5e11611a5d22252f3f9c169a3c9377eac0c32033.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 5965/1: Fix soft lockup in at91 udc driver
ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds
ARM: 6005/1: arm: kprobes: fix register corruption with jprobes
ARM: 6003/1: removing compilation warning from pl061.h
ARM: 6001/1: removing compilation warning comming from clkdev.h
ARM: 6000/1: removing compilation warning comming from <asm/irq.h>
ARM: 5999/1: Including device.h and resource.h header files in linux/amba/bus.h
ARM: 5997/1: ARM: Correct the VFPv3 detection
ARM: 5996/1: ARM: Change the mandatory barriers implementation (4/4)
ARM: 5995/1: ARM: Add L2x0 outer_sync() support (3/4)
ARM: 5994/1: ARM: Add outer_cache_fns.sync function pointer (2/4)
ARM: 5993/1: ARM: Move the outer_cache definitions into a separate file (1/4)
Diffstat (limited to 'drivers/watchdog/pika_wdt.c')
0 files changed, 0 insertions, 0 deletions