summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 15:09:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 15:09:08 -0700
commit99becf1328d8d71dd6f4480e3591d7dcdb389e57 (patch)
tree064206d6d3305b6b366be136eafdd5c2b44799d9
parentbf2785a818372603ad3ca3abcab65010f08a1d68 (diff)
parent03240b279dbbda41f2fc55ff4424acf651e25bef (diff)
parentad1ed2937eaa30adf9996ef5f21e0c1895f906b0 (diff)
Pull 'for-linus' branches of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{signal,vfs}
Pull signal and vfs compile breakage fixes from Al Viro. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: fixups for signal breakage * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: nommu: fix compilation of nommu.c