diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 09:04:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 09:04:11 -0800 |
| commit | 627f4b3ee3899bb70263ee77454a43c73136562f (patch) | |
| tree | 0464b4d97b462991e4f3458a9daa3665eaeb6f63 /drivers/watchdog/nv_tco.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff) | |
| parent | microblaze: Add missing v8.50.a version (diff) | |
| download | linux-dev-627f4b3ee3899bb70263ee77454a43c73136562f.tar.xz linux-dev-627f4b3ee3899bb70263ee77454a43c73136562f.zip | |
Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze patches from Michal Simek:
- add CCF support
- fix BS=0 compilation
- wire up defconfig
- some minor cleanups and fixes
* tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add missing v8.50.a version
microblaze: Fix missing bracket in printk
microblaze: Fix compilation error for BS=0
microblaze: Disable stack protection from bootloader
microblaze: Define read/write{b,w,l}_relaxed MMIO
microblaze: timer: Do not initialized system timer twice
microblaze: timer: Use generic sched_clock implementation
microblaze: Add NOTES section to linker script
microblaze: Add support for CCF
microblaze: Simplify fcpu helper function
microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h>
microblaze: Remove duplicate declarations of _stext[] and _etext[]
microblaze: Remove _fdt_start casts
microblaze: Wire up defconfig to mmu_defconfig
Diffstat (limited to 'drivers/watchdog/nv_tco.c')
0 files changed, 0 insertions, 0 deletions