diff options
| author | Linus Torvalds | 2011-03-30 16:53:17 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-03-30 16:53:17 +0200 |
| commit | a8e498b768d912ad3e7069c86b86bdb821d43b5f (patch) | |
| tree | 38ae01a72c640c951c071a8bd469d29400ac09d7 /include/scsi/osd_attributes.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
| parent | powerpc/qe_ic: Fix another breakage from the irq_data conversion (diff) | |
| download | kernel-qcow2-linux-a8e498b768d912ad3e7069c86b86bdb821d43b5f.tar.gz kernel-qcow2-linux-a8e498b768d912ad3e7069c86b86bdb821d43b5f.tar.xz kernel-qcow2-linux-a8e498b768d912ad3e7069c86b86bdb821d43b5f.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/qe_ic: Fix another breakage from the irq_data conversion
powerpc/8xx: Fix another breakage from the irq_data conversion
powerpc/cell: Use handle_edge_eoi_irq for real
powerpc/pseries: Enable Chelsio network and iWARP drivers
powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory
powerpc: Fix accounting of softirq time when idle
powerpc/pseries/smp: query-cpu-stopped-state support won't change
powerpc/xics: Use hwirq for xics domain irq number
powerpc/xics: Fix numberspace mismatch from irq_desc conversion
powerpc: Wire up new syscalls
powerpc/booke: Correct the SPRN_MAS5 definition.
powerpc: ARCH_PFN_OFFSET should be unsigned long
powerpc: Implement dma_mmap_coherent()
powerpc/nvram: Don't overwrite oops/panic report on normal shutdown
powerpc: Restore some misc devices to our configs
Diffstat (limited to 'include/scsi/osd_attributes.h')
0 files changed, 0 insertions, 0 deletions