Linus Torvalds 66b89159c2 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 a9185b41a4 ("pass writeback_control to ->write_inode")		2010-03-06 13:18:03 -08:00
..
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
asm-generic	gpio: introduce gpio_request_one() and friends	2010-03-06 11:26:48 -08:00
crypto
drm
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs	2010-03-06 13:18:03 -08:00
math-emu
media
mtd
net	9P2010.L handshake: Remove "dotu" variable	2010-03-05 15:04:42 -06:00
pcmcia
rdma	Merge branch 'misc' into for-next	2010-03-01 23:52:31 -08:00
rxrpc
scsi
sound	Merge branch 'topic/asoc' into for-linus	2010-03-01 12:38:59 +01:00
trace	Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-03-05 13:12:34 -08:00
video
xen
Kbuild