Jiri Kosina fb8231a8b1 Merge branch 'master' into for-next ... Conflicts: arch/arm/mach-omap1/board-nokia770.c		2010-08-10 13:22:08 +02:00
..
block	Merge branch 'master' into for-next	2010-08-10 13:22:08 +02:00
char	Merge branch 'master' into for-next	2010-08-10 13:22:08 +02:00
cio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-04 15:15:15 -07:00
crypto	[S390] avoid default_llseek in s390 drivers	2010-05-17 10:00:16 +02:00
kvm	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
net	qeth: avoid useless removal of multicast addresses	2010-07-23 12:36:25 -07:00
scsi	[SCSI] zfcp: Trigger logging in the FCP channel on qdio error conditions	2010-07-28 09:48:58 -05:00
Makefile