Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 May 2011 19:38:40 +0000 (12:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 May 2011 19:38:40 +0000 (12:38 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] wire up syncfs syscall
  [PARISC] wire up the fhandle syscalls
  [PARISC] wire up clock_adjtime syscall
  [PARISC] wire up fanotify syscalls
  [PARISC] prevent speculative re-read on cache flush
  [PARISC] only make executable areas executable
  [PARISC] fix pacache .size with new binutils

1  2 
arch/parisc/kernel/vmlinux.lds.S
arch/parisc/mm/init.c

Simple merge
Simple merge