summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2012-12-1526-356/+355
|\
| * sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)Jeff Garzik2012-12-141-0/+1
| * [libata] fix Null pointer dereference on disk errorXiaotian Feng2012-12-141-2/+4
| * ahci: convert ata_link_printk() to ata_link_warn()Wei Yongjun2012-12-141-1/+1
| * pata_imx: convert ata_dev_printk() to ata_dev_info()Wei Yongjun2012-12-141-1/+1
| * ARM: ep93xx: convert ata_<foo>_printk() to ata_<foo>_<level>()Wei Yongjun2012-12-141-4/+2
| * ahci_platform: make structs staticBrian Norris2012-12-141-3/+3
| * Revert "pata_octeon_cf: perform host detach, removal on exit"Jeff Garzik2012-12-141-1/+0
| * Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"Jeff Garzik2012-12-142-2/+2
| * pata_of_platform: fix compile errorBrian Norris2012-12-031-0/+1
| * libata: use pci_get_drvdata() helperBrian Norris2012-12-031-4/+3
| * pata_octeon_cf: perform host detach, removal on exitBrian Norris2012-12-031-0/+1
| * sata_highbank: utilize common ata_platform_remove_one()Brian Norris2012-12-031-11/+1
| * pata_palmld: utilize common ata_platform_remove_one()Brian Norris2012-12-031-3/+1
| * pata_platform: remove unused remove functionBrian Norris2012-12-032-19/+0
| * pata_platform: utilize common ata_platform_remove_one()Brian Norris2012-12-031-6/+1
| * pata_of_platform: utilize common ata_platform_remove_one()Brian Norris2012-12-031-6/+1
| * pata_mpc52xx: utilize common ata_platform_remove_one()Brian Norris2012-12-031-14/+3
| * pata_ixp4xx_cf: utilize common ata_platform_remove_one()Brian Norris2012-12-031-10/+1
| * ahci_platform: utilize common ata_platform_remove_one()Brian Norris2012-12-031-11/+1
| * libata: implement ata_platform_remove_one()Brian Norris2012-12-032-0/+27
| * ahci_platform: perform platform exit in host_stop() hookBrian Norris2012-12-031-7/+23
| * ahci_platform: convert to module_platform_driverBrian Norris2012-12-031-12/+1
| * ahci_platform: enable hotplug unbindingBrian Norris2012-12-031-2/+3
| * libata: set dma_mode to 0xff in resetAaron Lu2012-12-032-0/+2
| * ata_piix: re-order code and remove prototypesBartlomiej Zolnierkiewicz2012-12-031-221/+198
| * libata: check SATA_SETTINGS log with HW Feature CtrlShane Huang2012-12-032-2/+2
| * libata: restore acpi disable functionalityAaron Lu2012-12-032-0/+5
| * ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(Joe Perches2012-11-281-3/+3
| * pata_arasan_cf: declare/use more local variables in arasan_cf_dma_start()Sergei Shtylyov2012-11-281-2/+5
| * sata_highbank: use ATA_BUSYSergei Shtylyov2012-11-281-1/+1
| * sata_sx4: pdc20621_{ata|host}_sg() do not need 'tf' parameterSergei Shtylyov2012-11-281-8/+6
| * sata_sil24: remove unused variable from sata_sil24.cWei Yongjun2012-11-281-4/+0
| * sata_inic162x: remove unused variable in inic_scr_read()Wei Yongjun2012-11-281-2/+0
| * pata_rdc: remove unused variable in rdc_init_one()Wei Yongjun2012-11-281-3/+0
| * pata_cs5536: add quirk for broken udmaChristian Gmeiner2012-11-281-1/+31
| * ata_piix: reenable MS Virtual PC guestsOlaf Hering2012-11-281-3/+22
| * sata_promise: fix hardreset lockdep errorMikael Pettersson2012-11-281-2/+13
* | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblazeLinus Torvalds2012-12-1548-577/+679
|\ \
| * | microblaze: signal: Declare do_notify_resumeMichal Simek2012-12-132-1/+3
| * | microblaze: lib: Add lib function declarationsMichal Simek2012-12-131-0/+7
| * | microblaze: lib: Remove helper macrosMichal Simek2012-12-131-16/+12
| * | microblaze: Add static qualifiersMichal Simek2012-12-132-3/+3
| * | microblaze: Wire-up new system call kcmpMichal Simek2012-12-132-1/+3
| * | microblaze: Fix intc_enable_or_unmask functionMichal Simek2012-12-131-1/+2
| * | microblaze: Do not initialized regs->r1 twice in ELF_PLAT_INITMichal Simek2012-12-131-1/+1
| * | microblaze: Remove passing the second arg to schedule_tailMichal Simek2012-12-131-1/+0
| * | UAPI: (Scripted) Disintegrate arch/microblaze/include/asmDavid Howells2012-12-1338-552/+649
| * | microblaze: uaccess.h: Fix timerfd syscallMichal Simek2012-12-131-2/+1
| * | microblaze: Remove BIP from childregsMichal Simek2012-12-131-1/+0