Linus Torvalds e31a94ed37 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus ...

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
  [MIPS] Pb1200/DBAu1200: move platform code to its proper place
  [MIPS] Fix handling of trap and breakpoint instructions
  [MIPS] Pb1200: do register SMC 91C111
  [MIPS] DBAu1200: fix bad SMC 91C111 resource size
  [NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
  [MIPS] IP27: Fix build bug due to missing include
  [MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
  [MIPS] cevt-gt641xx: Kill unnecessary include
  [MIPS] DS1287: Add clockevent driver
  [MIPS] add DECstation I/O ASIC clocksource
  [MIPS] rbtx4938: minor cleanup
  [MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
  [MIPS] rbtx4938: misc cleanups
  [MIPS] jmr3927: use generic txx9 gpio
  [MIPS] rbhma4500: use generic txx9 gpio
  [MIPS] generic txx9 gpio support
  [MIPS] make fallback gpio.h gpiolib-friendly
  [MIPS] unexport null_perf_irq() and make it static
  [MIPS] unexport rtc_mips_set_time()
  [MIPS] unexport copy_from_user_page()
  ...

2008-04-28 10:51:43 -07:00

..

arm

more icside breakage (from next ide merge)

2008-04-28 10:03:31 -07:00

cris

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

h8300

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

legacy

q40ide breakage

2008-04-28 10:03:31 -07:00

mips

[MIPS] Pb1200/DBAu1200: move platform code to its proper place

2008-04-28 17:14:33 +01:00

pci

ide: remove /proc/ide/ali

2008-04-27 15:38:33 +02:00

ppc

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-acpi.c

ide: add "noacpi" / "acpigtf" / "acpionboot" parameters

2008-04-27 15:38:30 +02:00

ide-cd_ioctl.c

ide-cd: mark REQ_TYPE_ATA_PC write requests with REQ_RW flag

2008-03-07 21:53:49 +01:00

ide-cd_verbose.c

ide-cd: move VERBOSE_IDE_CD_ERRORS code to ide-cd_verbose.c

2008-02-01 23:09:23 +01:00

ide-cd.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-cd.h

ide-cd: remove the internal 64k buffer

2008-04-26 17:36:37 +02:00

ide-disk.c

ide-disk: fix issues found by checkpatch.pl

2008-04-26 17:36:37 +02:00

ide-dma.c

ide: constify struct ide_dma_ops

2008-04-26 22:25:24 +02:00

ide-floppy.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-generic.c

ide: cleanup setting hwif->mmio flag

2008-04-26 22:25:19 +02:00

ide-io.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-iops.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-lib.c

ide: replace remaining __FUNCTION__ occurrences

2008-04-26 22:25:20 +02:00

ide-pnp.c

ide: make ide_unregister() take 'ide_hwif_t *' as an argument (take 2)

2008-04-27 15:38:31 +02:00

ide-probe.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-proc.c

ide: remove now unused ide_pci_create_host_proc()

2008-04-27 15:38:34 +02:00

ide-scan-pci.c

ide: replace remaining __FUNCTION__ occurrences

2008-04-26 22:25:20 +02:00

ide-tape.c

ide-tape: remove tape->merge_stage

2008-04-27 15:38:34 +02:00

ide-taskfile.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

ide-timing.h

Spelling fixes: lenght->length

2008-02-03 15:42:53 +02:00

ide.c

ide: add struct ide_io_ports (take 3)

2008-04-27 15:38:32 +02:00

Kconfig

ide/Kconfig: BLK_DEV_4DRIVES should be a tristate

2008-04-26 17:36:31 +02:00

Makefile

ide: fix ide_find_port()

2008-04-18 00:46:21 +02:00

setup-pci.c

ide: constify struct ide_dma_ops

2008-04-26 22:25:24 +02:00