linux-sg2042/drivers/block
Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
  [POWERPC] re-enable OProfile for iSeries, using timer interrupt
  [POWERPC] support ibm,extended-*-frequency properties
  [POWERPC] Extra sanity check in EEH code
  [POWERPC] Dont look for class-code in pci children
  [POWERPC] Fix mdelay badness on shared processor partitions
  [POWERPC] disable floating point exceptions for init
  [POWERPC] Unify ppc syscall tables
  [POWERPC] mpic: add support for serial mode interrupts
  [POWERPC] pseries: Print PCI slot location code on failure
  [POWERPC] spufs: one more fix for 64k pages
  [POWERPC] spufs: fail spu_create with invalid flags
  [POWERPC] spufs: clear class2 interrupt status before wakeup
  [POWERPC] spufs: fix Makefile for "make clean"
  [POWERPC] spufs: remove stop_code from struct spu
  [POWERPC] spufs: fix spu irq affinity setting
  [POWERPC] spufs: further abstract priv1 register access
  [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
  [POWERPC] spufs: dont try to access SPE channel 1 count
  [POWERPC] spufs: use kzalloc in create_spu
  [POWERPC] spufs: fix initial state of wbox file
  ...

Manually resolved conflicts in:
	drivers/net/phy/Makefile
	include/asm-powerpc/spu.h
2006-06-22 22:11:30 -07:00
..
aoe [NET]: Clean up skb_linearize 2006-06-17 21:30:16 -07:00
paride [PATCH] drivers/block/paride/pd.c: fix an off-by-one error 2006-03-28 09:16:03 -08:00
DAC960.c [SCSI] fix (unlikely) memory leak in DAC960 driver 2006-05-20 09:23:23 -05:00
DAC960.h [PATCH] DAC960: add support for Mylex AcceleRAID 4/5/600 2005-05-05 16:36:43 -07:00
Kconfig [PATCH] let BLK_DEV_RAM_COUNT depend on BLK_DEV_RAM 2006-03-28 09:16:02 -08:00
Makefile [PATCH] block: floppy98 removal, really. 2006-03-24 07:33:26 -08:00
acsi.c [PATCH] Add block_device_operations.getgeo block device method 2006-01-08 20:13:54 -08:00
acsi_slm.c [PATCH] drivers/block/acsi_slm.c: size_t can't be < 0 2006-03-28 09:16:03 -08:00
amiflop.c [PATCH] Don't pass boot parameters to argv_init[] 2006-03-31 12:18:53 -08:00
ataflop.c [PATCH] Remove MODULE_PARM 2006-03-25 08:22:52 -08:00
cciss.c [PATCH] CCISS: add device symlink to the block cciss block devices in sysfs 2006-06-21 12:40:47 -07:00
cciss.h [PATCH] cciss: avoid defining useless MAJOR_NR macro 2006-01-08 20:14:09 -08:00
cciss_cmd.h [PATCH] cciss: direct lookup for command completions 2005-09-13 08:22:30 -07:00
cciss_scsi.c [SCSI] fix up request buffer reference in various scsi drivers 2006-06-06 11:07:25 -04:00
cciss_scsi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cpqarray.c BUG_ON() Conversion in drivers/block/ 2006-03-24 18:50:27 +01:00
cpqarray.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cryptoloop.c [CRYPTO]: Use CRYPTO_TFM_REQ_MAY_SLEEP where appropriate 2005-09-01 17:43:25 -07:00
floppy.c [PATCH] powerpc: Use check_legacy_ioport() on ppc32 too. 2006-04-28 21:04:55 +10:00
ida_cmd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ida_ioctl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
loop.c [PATCH] loop: potential kernel hang waiting for kthread 2006-03-26 08:56:57 -08:00
nbd.c [PATCH] drivers/block/nbd.c: don't defer compile error to runtime 2006-03-25 08:22:52 -08:00
pktcdvd.c [PATCH] mempool: use common mempool kmalloc allocator 2006-03-26 08:56:59 -08:00
ps2esdi.c [PATCH] Fix drivers/block/ps2esdi.c compile 2006-01-16 20:24:45 -08:00
rd.c [PATCH] set_page_dirty() return value fixes 2006-03-24 07:33:26 -08:00
smart1,2.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
swim3.c [PATCH] powerpc: Remove device_node addrs/n_addr 2006-01-09 14:53:55 +11:00
swim_iop.c [PATCH] drivers/block: fix-up schedule_timeout() usage 2005-09-10 10:06:38 -07:00
sx8.c Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 2006-01-09 18:41:42 -08:00
ub.c [PATCH] ub: random cleanups 2006-06-21 15:04:14 -07:00
umem.c [PATCH] Replace 0xff.. with correct DMA_xBIT_MASK 2006-03-28 09:16:07 -08:00
viodasd.c [PATCH] powerpc: update iSeries viodasd device-tree entries 2006-05-19 14:35:28 +10:00
xd.c [PATCH] drivers/block: Use ARRAY_SIZE macro 2006-01-08 20:14:08 -08:00
xd.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
z2ram.c [PATCH] vfree and kfree cleanup in drivers/ 2005-09-10 10:06:30 -07:00