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	Merge branch 'drm-radeon-testing' of /ssd/git/drm-radeon-next into drm-next-stage	2010-03-01 16:08:57 +10:00
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	V4L/DVB: tuner-types: Add Sony BTF-Pxn01Z tuner type used on GigaPocket cards	2010-02-26 15:11:07 -03:00
mtd
net	9P2010.L handshake: Remove "dotu" variable	2010-03-05 15:04:42 -06:00
pcmcia	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
rdma	Merge branch 'misc' into for-next	2010-03-01 23:52:31 -08:00
rxrpc
scsi	[SCSI] scsi_transport_sas: add support for transport layer retries (TLR)	2010-02-08 17:15:19 -06:00
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	video: sh_mobile_lcdcfb: Add wait for vsync.	2010-02-16 13:30:27 +09:00
xen
Kbuild