Linus Torvalds 29bd17af7d Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits) ocfs2: clean up bh null checks ocfs2: document access rules for blocked_lock_list configfs: file.c fix possible recursive locking configfs: dir.c fix possible recursive locking configfs: Remove EXPERIMENTAL ocfs2: bump version number ocfs2/dlm: Clear joining_node on hearbeat node down ocfs2: convert byte order of constant instead of variable ocfs2: Update default cluster timeouts ocfs2: printf fixes ocfs2: Use generic_file_llseek ocfs2: Safer read_inline_data() ocfs2: Silence false lockdep warnings [PATCH 2/2] ocfs2: cluster aware flock() [PATCH 1/2] ocfs2: add flock lock type ocfs2: Local alloc window size changeable via mount option ocfs2: Support commit= mount option ocfs2: Add missing permission checks [PATCH 2/2] ocfs2: Implement group add for online resize [PATCH 1/2] ocfs2: Add group extend for online resize ...		2008-01-25 17:11:13 -08:00
..
acpi	kobject: convert /sys/firmware/acpi/ to use kobject_create	2008-01-24 20:40:23 -08:00
asm-alpha
asm-arm	[ARM] pxa: silence warnings from cpu_is_xxx() macros	2008-01-10 12:33:54 +00:00
asm-avr32	[AVR32] NMI debugging	2008-01-25 08:31:43 +01:00
asm-blackfin
asm-cris	ide: remove stale ide.h "configuration options"	2008-01-25 22:17:08 +01:00
asm-frv	ide: remove stale ide.h "configuration options"	2008-01-25 22:17:08 +01:00
asm-generic	sched: SCHED_FIFO/SCHED_RR watchdog timer	2008-01-25 21:08:27 +01:00
asm-h8300
asm-ia64	[IA64] Update Altix BTE error return status patch	2008-01-03 13:18:58 -08:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips	[MIPS] SMTC: Fix build error.	2008-01-22 00:35:23 +00:00
asm-parisc
asm-powerpc	ide: remove stale ide.h "configuration options"	2008-01-25 22:17:08 +01:00
asm-ppc
asm-s390
asm-sh	sh: Force __access_ok() to obey address space limit.	2008-01-11 13:18:16 +09:00
asm-sh64
asm-sparc
asm-sparc64	[SPARC64]: Implement pci_resource_to_user()	2007-12-26 19:33:46 -08:00
asm-um
asm-v850
asm-x86	sched: high-res preemption tick	2008-01-25 21:08:29 +01:00
asm-xtensa
crypto	[CRYPTO] api: Include sched.h for cond_resched in scatterwalk.h	2008-01-11 08:16:59 +11:00
keys
linux	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2	2008-01-25 17:11:13 -08:00
math-emu
media	V4L/DVB (7058): IR corrections for the Pinnacle 800i	2008-01-25 19:05:11 -02:00
mtd
net	IPoIB: improve IPv4/IPv6 to IB mcast mapping functions	2008-01-25 14:15:37 -08:00
pcmcia
rdma	RDMA/cma: add support for rdma_migrate_id()	2008-01-25 14:15:32 -08:00
rxrpc
scsi	Revert "scsi: revert "[SCSI] Get rid of scsi_cmnd->done""	2008-01-06 10:17:12 -08:00
sound
video
xen
Kbuild