summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 22:11:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-08 22:11:53 +0200
commit6c2580c501c660fdfb506061e016d84570fceba1 (patch)
treec194f82f1327e5453a7fcd702eb9c33a997ca6a5 /fs
parentuserns: limit the maximum depth of user_namespace->parent chain (diff)
parentavr32: boards/atngw100/mrmt.c: fix building error (diff)
downloadlinux-6c2580c501c660fdfb506061e016d84570fceba1.tar.xz
linux-6c2580c501c660fdfb506061e016d84570fceba1.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 build fix from Hans-Christian Egtvedt. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: avr32: boards/atngw100/mrmt.c: fix building error
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions