David S. Miller 2ec8c6bb5d Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c		2010-05-18 23:01:55 -07:00
..
block	[S390] dasd: fix race between tasklet and dasd_sleep_on	2010-05-12 09:32:26 +02:00
char	[S390] zcore: Fix reipl device detection	2010-04-22 17:17:19 +02:00
cio	[S390] cio: use exception-save stsch	2010-04-22 17:17:19 +02:00
crypto	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
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: support the new OSA CHPID types OSX and OSM	2010-05-17 22:42:55 -07:00
scsi	[SCSI] zfcp: Fix tracing of requests with error status	2010-04-11 13:31:20 -05:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00