diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 19:21:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-09 19:21:39 -0800 |
| commit | 17b2112f332db7c2bac56926c9e627807bce3615 (patch) | |
| tree | 72f8ad178eece0588e2b396d0de76ef14ebe616e /drivers/watchdog/softdog.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| parent | e641eb03ab2b0f065fa5e64b4202fb5b0441b427 (diff) | |
| download | linux-17b2112f332db7c2bac56926c9e627807bce3615.tar.gz linux-17b2112f332db7c2bac56926c9e627807bce3615.tar.bz2 linux-17b2112f332db7c2bac56926c9e627807bce3615.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Ben Herrenschmidt:
"Here are a handful of powerpc fixes for 3.13.
The patches are reasonably trivial and self contained. Note the offb
patches outside of arch/powerpc, they are LE fixes for our
open-firmware 'dumb' framebuffer"
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix up the kdump base cap to 128M
powernv: Fix VFIO support with PHB3
powerpc/52xx: Re-enable bestcomm driver in defconfigs
powerpc/pasemi: Turn on devtmpfs in defconfig
offb: Add palette hack for little endian
offb: Little endian fixes
powerpc: Fix PTE page address mismatch in pgtable ctor/dtor
powerpc/44x: Fix ocm_block allocation
powerpc: Fix build break with PPC_EARLY_DEBUG_BOOTX=y
powerpc/512x: dts: remove misplaced IRQ spec from 'soc' node
Diffstat (limited to 'drivers/watchdog/softdog.c')
0 files changed, 0 insertions, 0 deletions