summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2009-03-265-108/+40
|\
| * ide: use try_to_identify() in ide_driveid_update()Bartlomiej Zolnierkiewicz2009-03-241-0/+2
| * ide: remove broken EXABYTENEST supportBartlomiej Zolnierkiewicz2009-03-241-2/+0
| * mn10300: remove <asm/ide.h>Bartlomiej Zolnierkiewicz2009-03-242-42/+2
| * frv: remove <asm/ide.h>Bartlomiej Zolnierkiewicz2009-03-242-26/+2
| * ide: remove pciirq argument from ide_pci_setup_ports()Bartlomiej Zolnierkiewicz2009-03-241-1/+1
| * ide: fix ->init_chipset method to return 'int' valueBartlomiej Zolnierkiewicz2009-03-241-2/+2
| * ide: remove no longer needed IRQ fallback code from hwif_init()Bartlomiej Zolnierkiewicz2009-03-241-15/+0
| * ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQSBartlomiej Zolnierkiewicz2009-03-241-4/+0
| * mn10300: add pci_get_legacy_ide_irq() to <asm/pci.h>Bartlomiej Zolnierkiewicz2009-03-241-0/+5
| * ide: move error handling code to ide-eh.c (v2)Bartlomiej Zolnierkiewicz2009-03-241-5/+8
| * ide: move xfer mode tuning code to ide-xfer-mode.cBartlomiej Zolnierkiewicz2009-03-241-5/+7
| * ide: move device settings code to ide-devsets.cBartlomiej Zolnierkiewicz2009-03-241-0/+1
| * ide: move ide_do_park_unpark() to ide-park.cBartlomiej Zolnierkiewicz2009-03-241-0/+2
| * ide: remove ide_do_drive_cmd()Bartlomiej Zolnierkiewicz2009-03-241-2/+0
| * ide: move ide_dma_timeout_retry() to ide-dma.cBartlomiej Zolnierkiewicz2009-03-241-0/+2
| * ide: move drive_is_ready() to ide-io.cBartlomiej Zolnierkiewicz2009-03-241-2/+0
| * ide: sanitize ACPI initializationBartlomiej Zolnierkiewicz2009-03-241-2/+4
| * ide: add ide_for_each_present_dev() iteratorBartlomiej Zolnierkiewicz2009-03-241-0/+4
| * ide: move ide_pktcmd_tf_load() to ide-atapi.cBartlomiej Zolnierkiewicz2009-03-241-2/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2009-03-263-21/+55
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2009-03-1052-137/+233
| |\ \
| * | | sh: multiple vectors per irq - baseMagnus Damm2009-02-271-0/+1
| * | | sh: maple: Support block reads and writes.Adrian McMenamin2009-02-271-21/+41
| * | | Merge branch 'sh/stable-updates'Paul Mundt2009-02-12118-221/+498
| |\ \ \
| * | | | sh: CMT clockevent platform driverMagnus Damm2009-01-291-0/+13
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2009-03-261-277/+0
|\ \ \ \ \
| * | | | | GFS2: Merge lock_dlm module into GFS2Steven Whitehouse2009-03-241-277/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2009-03-2625-422/+381
|\ \ \ \ \
| * \ \ \ \ Merge branch 'topic/isa-misc' into for-linusTakashi Iwai2009-03-241-1/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'fix/opl3sa2-suspend' into topic/isa-miscTakashi Iwai2009-03-17340-15635/+816
| | |\ \ \ \ \
| | * | | | | | ALSA: ALS4000, slight mixer improvementsAndreas Mohr2009-02-231-1/+3
| * | | | | | | Merge branch 'topic/hda' into for-linusTakashi Iwai2009-03-241-0/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'topic/quirk-cleanup' into topic/hdaTakashi Iwai2009-02-09230-15399/+305
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add PCI DFI vendor IDMatthew Ranostay2009-01-231-0/+2
| * | | | | | | | | Merge branch 'topic/drop-l3' into for-linusTakashi Iwai2009-03-241-126/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ALSA: drop outdated and broken sa11xx-uda1341 driverDmitry Artamonow2009-03-171-126/+0
| | * | | | | | | | | Merge branch 'topic/snd_card_new-err' into topic/drop-l3Takashi Iwai2009-03-171-1/+13
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch 'topic/cs423x-merge' into for-linusTakashi Iwai2009-03-242-0/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detectionKrzysztof Helt2009-02-161-0/+1
| | * | | | | | | | | | | Merge branch 'topic/snd_card_new-err' into topic/cs423x-mergeTakashi Iwai2009-02-161-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | ALSA: ad1816a: enable hardware timerKrzysztof Helt2009-01-211-0/+2
| * | | | | | | | | | | Merge branch 'topic/atmel' into for-linusTakashi Iwai2009-03-242-0/+63
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ALSA: Add ALSA driver for Atmel AC97 controllerHans-Christian Egtvedt2009-02-051-0/+40
| | * | | | | | | | | | | ALSA: Add ALSA driver for Atmel Audio Bitstream DACHans-Christian Egtvedt2009-02-051-0/+23
| | * | | | | | | | | | | Merge branch 'topic/snd_card_new-err' into topic/atmelTakashi Iwai2009-02-051-1/+13
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | / / / | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-03-248-155/+113
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ASoC: Allow choice of ac97 gpio reset lineRobert Jarzmik2009-03-151-0/+15
| | * | | | | | | | | | | ASoC: Merge dai_ops factor outMark Brown2009-03-111-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | ASoC: make ops a pointer in 'struct snd_soc_dai'Eric Miao2009-03-041-1/+1