summaryrefslogtreecommitdiff
path: root/drivers/macintosh/apm_emu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-10 00:55:51 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-10 00:55:51 +0300
commit78833dd70602be6b71ef34225f708b1e500947dc (patch)
tree807050f760ccc7305b194d7568ebf98737076a40 /drivers/macintosh/apm_emu.c
parenta5abba989deceb731047425812d268daf7536575 (diff)
parentb306419ae08d9def53f2142a37cc0a58622307a8 (diff)
downloadlinux-78833dd70602be6b71ef34225f708b1e500947dc.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: nd->inode is not set on the second attempt in path_walk() unfuck proc_sysctl ->d_compare() minimal fix for do_filp_open() race
Diffstat (limited to 'drivers/macintosh/apm_emu.c')
0 files changed, 0 insertions, 0 deletions