summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/usnjrnl.h
diff options
context:
space:
mode:
authorLinus Torvalds2013-04-25 02:01:58 +0200
committerLinus Torvalds2013-04-25 02:01:58 +0200
commit3c71d03a28ce653708a9a6dadc5536bf49cbc5fc (patch)
tree0998893f38ab49c1ea89a33102713bc92b5d9d4c /fs/ntfs/usnjrnl.h
parentMerge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff)
parentRevert "gpio: pxa: set initcall level to module init" (diff)
downloadkernel-qcow2-linux-3c71d03a28ce653708a9a6dadc5536bf49cbc5fc.tar.gz
kernel-qcow2-linux-3c71d03a28ce653708a9a6dadc5536bf49cbc5fc.tar.xz
kernel-qcow2-linux-3c71d03a28ce653708a9a6dadc5536bf49cbc5fc.zip
Merge tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
Pull gpi fix from Linus Walleij: "This is a last minute revert for the GPIO tree, as Mike Dunn noticed breakage on some older PXA machines due to moving PXA GPIO initcalls to the module_init initlevel" * tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: Revert "gpio: pxa: set initcall level to module init"
Diffstat (limited to 'fs/ntfs/usnjrnl.h')
0 files changed, 0 insertions, 0 deletions