diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 20:13:46 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 20:13:46 +0100 |
commit | 0969d11e201b82d30a158ccdb3aca67a7b845613 (patch) | |
tree | 25273891ff5ac341d5c65ee0f82fc0a55aa8cfb6 /fs/ocfs2/cluster/heartbeat.c | |
parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | microblaze: remove obsolete DEBUG_BOOTMEM (diff) | |
download | linux-0969d11e201b82d30a158ccdb3aca67a7b845613.tar.xz linux-0969d11e201b82d30a158ccdb3aca67a7b845613.zip |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: remove obsolete DEBUG_BOOTMEM
microblaze: trivial: Fix removed the part of line
microblaze: Fix __muldi3 function for little-endian.
microblaze: Clear i/dcache for sw breakpoints
microblaze: Remove useless early_init_dt_check_for_initrd
microblaze: Fix unaligned exception for little endian platform
microblaze: Add PVR for Microblaze v8.00.b
microblaze: Correct PVR access macros
Revert "microblaze: Simplify syscall rutine"
microblaze: Fix initramfs
arch/microblaze: Remove unnecessary semicolons
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
0 files changed, 0 insertions, 0 deletions