summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-05 00:09:08 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-05 00:09:08 +0200
commit99becf1328d8d71dd6f4480e3591d7dcdb389e57 (patch)
tree064206d6d3305b6b366be136eafdd5c2b44799d9 /kernel/time
parentMerge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 (diff)
parentfixups for signal breakage (diff)
parentnommu: fix compilation of nommu.c (diff)
downloadlinux-99becf1328d8d71dd6f4480e3591d7dcdb389e57.tar.xz
linux-99becf1328d8d71dd6f4480e3591d7dcdb389e57.zip
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