linux/drivers/block
Linus Torvalds 489de30259 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (209 commits)
  [POWERPC] Create add_rtc() function to enable the RTC CMOS driver
  [POWERPC] Add H_ILLAN_ATTRIBUTES hcall number
  [POWERPC] xilinxfb: Parameterize xilinxfb platform device registration
  [POWERPC] Oprofile support for Power 5++
  [POWERPC] Enable arbitary speed tty ioctls and split input/output speed
  [POWERPC] Make drivers/char/hvc_console.c:khvcd() static
  [POWERPC] Remove dead code for preventing pread() and pwrite() calls
  [POWERPC] Remove unnecessary #undef printk from prom.c
  [POWERPC] Fix typo in Ebony default DTS
  [POWERPC] Check for NULL ppc_md.init_IRQ() before calling
  [POWERPC] Remove extra return statement
  [POWERPC] pasemi: Don't auto-select CONFIG_EMBEDDED
  [POWERPC] pasemi: Rename platform
  [POWERPC] arch/powerpc/kernel/sysfs.c: Move NUMA exports
  [POWERPC] Add __read_mostly support for powerpc
  [POWERPC] Modify sched_clock() to make CONFIG_PRINTK_TIME more sane
  [POWERPC] Create a dummy zImage if no valid platform has been selected
  [POWERPC] PS3: Bootwrapper support.
  [POWERPC] powermac i2c: Use mutex
  [POWERPC] Schedule removal of arch/ppc
  ...

Fixed up conflicts manually in:

	Documentation/feature-removal-schedule.txt
	arch/powerpc/kernel/pci_32.c
	arch/powerpc/kernel/pci_64.c
	include/asm-powerpc/pci.h

and asked the powerpc people to double-check the result..
2007-07-16 17:58:08 -07:00
..
aoe [NET]: Rework dev_base via list_head (v3) 2007-05-03 15:13:45 -07:00
paride paride drivers: initialize spinlocks 2007-04-24 08:23:08 -07:00
amiflop.c [PATCH] fix request->cmd == INT cases 2007-07-10 08:03:34 +02:00
ataflop.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
cciss_cmd.h [PATCH] cciss: add support for 1024 logical volumes 2006-12-07 08:39:30 -08:00
cciss_scsi.c [SCSI] cciss: convert to use the data buffer accessors 2007-05-29 11:22:13 -05:00
cciss_scsi.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cciss.c Fix too few arguments to function `scsi_cmd_ioctl' 2007-07-16 12:11:27 -07:00
cciss.h [PATCH] cciss: add support for 1024 logical volumes 2006-12-07 08:39:30 -08:00
cpqarray.c [PATCH] getting rid of all casts of k[cmz]alloc() calls 2006-12-13 09:05:58 -08:00
cpqarray.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cryptoloop.c [BLOCK] cryptoloop: Use block ciphers where applicable 2006-09-21 11:45:53 +10:00
DAC960.c [PATCH] mark struct file_operations const 3 2007-02-12 09:48:45 -08:00
DAC960.h [PATCH] drivers/block/DAC960: convert 'boolean' to 'bool' 2007-02-11 11:18:06 -08:00
floppy.c Off by one in floppy.c 2007-05-23 20:14:15 -07: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
Kconfig Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block 2007-07-16 10:48:20 -07:00
loop.c pipe: change the ->pin() operation to ->confirm() 2007-07-10 08:04:15 +02:00
Makefile Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block 2007-07-16 10:48:20 -07:00
nbd.c nbd.c: sock_xmit: cleanup signal related code 2007-07-16 09:05:50 -07:00
pktcdvd.c kcdrwd: remove unneeded flush_signals() call 2007-07-16 09:05:50 -07:00
ps2esdi.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rd.c Fix occurrences of "the the " 2007-05-09 08:57:56 +02:00
smart1,2.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sunvdc.c [SPARC64]: Abstract out mdesc accesses for better MD update handling. 2007-07-16 04:04:28 -07:00
swim3.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sx8.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ub.c bsg: add a request_queue argument to scsi_cmd_ioctl() 2007-07-16 08:52:45 +02:00
umem.c umem: Fix match of pci_ids in umem driver 2007-07-16 14:39:07 +02:00
viodasd.c [POWERPC] Fix viodasd geometry calculations 2007-07-10 21:40:28 +10:00
xd.c [PATCH] Use linux/io.h instead of asm/io.h 2006-10-11 11:14:23 -07:00
xd.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
z2ram.c drivers/block/z2ram: Remove TRUE/FALSE defines 2007-07-16 09:05:42 -07:00