q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/block
History
Linus Torvalds 723e9db7a4 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c
2009-09-15 09:51:09 -07:00
..
aoe Merge branch 'for-2.6.32' of git://git.kernel.dk/linux-2.6-block 2009-09-14 17:55:15 -07:00
paride block: use printk_once 2009-09-11 14:34:33 +02:00
amiflop.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
ataflop.c ataflop: adjust NULL test 2009-07-17 15:29:58 +09:00
brd.c ramdisk: remove long-deprecated "ramdisk=" boot-time parameter 2009-06-10 23:07:15 +02:00
cciss.c cciss: memory leak in cciss_init_one() 2009-09-11 14:34:33 +02:00
cciss.h cciss: Remove no longer needed sendcmd reject processing code 2009-06-09 05:47:43 +02:00
cciss_cmd.h cciss: Ignore stale commands after reboot 2009-07-03 21:06:45 +02:00
cciss_scsi.c cciss: decode unit attention in SCSI error handling code 2009-06-09 05:47:44 +02:00
cciss_scsi.h
cpqarray.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
cpqarray.h
cryptoloop.c
DAC960.c headers: smp_lock.h redux 2009-07-12 12:22:34 -07:00
DAC960.h
floppy.c floppy: Switch driver to dev_pm_ops 2009-09-14 20:26:59 +02:00
hd.c hd: stop defining MAJOR_NR 2009-06-18 09:56:20 +02:00
ida_cmd.h
ida_ioctl.h
Kconfig osdblk: a Linux block device for OSD objects 2009-06-24 12:25:02 +03:00
loop.c bio: first step in sanitizing the bio->bi_rw flag testing 2009-09-11 14:33:31 +02:00
Makefile osdblk: a Linux block device for OSD objects 2009-06-24 12:25:02 +03:00
mg_disk.c mg_disk: Add missing ready status check on mg_write() 2009-07-28 08:57:33 +02:00
nbd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
osdblk.c osdblk: Adjust queue limits to lower device's limits 2009-06-24 12:27:01 +03:00
pktcdvd.c Fix congestion_wait() sync/async vs read/write confusion 2009-07-10 20:31:53 +02:00
ps3disk.c block/ps3: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
ps3vram.c powerpc/cell: Move CBE_IOPTE_* to <asm/cell-regs.h> 2009-08-20 10:29:26 +10:00
smart1,2.h
sunvdc.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim3.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
swim_asm.S m68k: mac - Add SWIM floppy support 2009-03-26 21:15:27 +01:00
sx8.c block: use printk_once 2009-09-11 14:34:33 +02:00
ub.c block: Do away with the notion of hardsect_size 2009-05-22 23:22:54 +02:00
umem.c umem: fix request_queue lock warning 2009-04-24 08:54:21 +02:00
umem.h
viodasd.c block: use printk_once 2009-09-11 14:34:33 +02:00
virtio_blk.c Merge branch 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc 2009-07-22 10:06:33 -07:00
xd.c block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
xd.h
xen-blkfront.c xen block: remove driver_data direct access of struct device 2009-06-15 21:30:27 -07:00
xsysace.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
z2ram.c z2ram: Small cleanup for z2ram.c 2009-07-15 11:27:40 +09:00