summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-02 09:03:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-02 09:03:54 -0700
commit233e562eac549f4f719176bbddeb50c3f17a9c8d (patch)
treeb6da3ebfee26d3dc05cd8f09bc64e7a568024fc0 /arch
parent829f51dbd825256197fb2a89705d42ad83f958ef (diff)
parent0fd7bee1e9b68fd271ad87c3e705facd1ca38055 (diff)
parenta3936249694775d8fb25d19ddf0ed6263e33dd14 (diff)
Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs,signal}
Pull vfs fix and a fix from the signal changes for frv from Al Viro. The __kernel_nlink_t for powerpc got scrogged because 64-bit powerpc actually depended on the default "unsigned long", while 32-bit powerpc had an explicit override to "unsigned short". Al didn't notice, and made both of them be the unsigned short. The frv signal fix is fallout from simplifying the do_notify_resume() code, and leaving an extra parenthesis. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: powerpc: Fix size of st_nlink on 64bit * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: frv: Remove bogus closing parenthesis