summaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/syscall_table.S
diff options
context:
space:
mode:
authorLinus Torvalds2010-03-06 22:18:03 +0100
committerLinus Torvalds2010-03-06 22:18:03 +0100
commit66b89159c25a47d2177743526c61b5ada7acc39e (patch)
treeb092b859ca01d7544a666c95f940144b0ef3b35b /arch/parisc/kernel/syscall_table.S
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff)
parent[LogFS] Change magic number (diff)
downloadkernel-qcow2-linux-66b89159c25a47d2177743526c61b5ada7acc39e.tar.gz
kernel-qcow2-linux-66b89159c25a47d2177743526c61b5ada7acc39e.tar.xz
kernel-qcow2-linux-66b89159c25a47d2177743526c61b5ada7acc39e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Change magic number [LogFS] Remove h_version field [LogFS] Check feature flags [LogFS] Only write journal if dirty [LogFS] Fix bdev erases [LogFS] Silence gcc [LogFS] Prevent 64bit divisions in hash_index [LogFS] Plug memory leak on error paths [LogFS] Add MAINTAINERS entry [LogFS] add new flash file system Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in fs/logfs/inode.c introduced by write_inode() being changed to use writeback_control' by commit a9185b41a4f84971b930c519f0c63bd450c4810d ("pass writeback_control to ->write_inode")
Diffstat (limited to 'arch/parisc/kernel/syscall_table.S')
0 files changed, 0 insertions, 0 deletions