diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 20:36:35 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 20:36:35 (GMT) |
commit | c5258190c2ae664cdf367417a2a25e5fa4104322 (patch) | |
tree | d0c914991882bc1009b173696b9919af51d4d56e /drivers/char/dtlk.c | |
parent | 1ed55eac3b1fc30b29cdb52251e0f13b24fc344c (diff) | |
parent | 4378bb695670e65ca4aeee1e7588cfa2381351a5 (diff) | |
download | linux-c5258190c2ae664cdf367417a2a25e5fa4104322.tar.xz |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"The main change is UAPI for Microblaze."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: signal: Declare do_notify_resume
microblaze: lib: Add lib function declarations
microblaze: lib: Remove helper macros
microblaze: Add static qualifiers
microblaze: Wire-up new system call kcmp
microblaze: Fix intc_enable_or_unmask function
microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INIT
microblaze: Remove passing the second arg to schedule_tail
UAPI: (Scripted) Disintegrate arch/microblaze/include/asm
microblaze: uaccess.h: Fix timerfd syscall
microblaze: Remove BIP from childregs
Diffstat (limited to 'drivers/char/dtlk.c')
0 files changed, 0 insertions, 0 deletions