1. 05 Mar, 2007 28 commits
  2. 04 Mar, 2007 12 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 20b0f65d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: make legacy IDE VLB modules check for the "probe" kernel params (v2)
        ide: remove some obsoleted kernel params (v2)
        ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
        scc_pata: bugfix for checking DMA IRQ status
        ide: remove a ton of pointless #undef REALLY_SLOW_IO
        siimage: DRAC4 note
        adjust legacy IDE resource setting (v2)
        ide: fix pmac breakage
        ide-cs: Update device table
        ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
        piix/slc90e66: more tuneproc() fixing (take 2)
        ide: fix drive side 80c cable check, take 2
        cmd64x: fix PIO mode setup (take 3)
        alim15x3: fix PIO mode setup
      20b0f65d
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 70077f2f
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [libata] pata_jmicron: build fix
      70077f2f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 85a5d77a
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (5260): Cx88-blackbird: allow usage of both 376836 and 262144 sized firmware images
        V4L/DVB (5366): Pvrusb2: Fix compilation warning for amd64 builds (use %zu instead of %u)
      85a5d77a
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 6d04e3b0
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [VLAN]: Avoid a 4-order allocation.
        [HDLC] Fix dev->header_cache_update having a random value.
        [NetLabel]: Verify sensitivity level has a valid CIPSO mapping
        [PPPOE]: Key connections properly on local device.
        [AF_UNIX]: Test against sk_max_ack_backlog properly.
        [NET]: Fix bugs in "Whether sock accept queue is full" checking
      6d04e3b0
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 42270035
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
        [ARM] Acorn: move the i2c bus driver into drivers/i2c
        [ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries
        [ARM] ARM FAS216: don't modify scsi_cmnd request_bufflen
        [ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC
        [ARM] rtc-pcf8583: correct month and year offsets
        [ARM] rtc-pcf8583: don't use BCD_TO_BIN/BIN_TO_BCD
        [ARM] EBSA110: Work around build errors
        [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system
        [ARM] 4239/1: S3C24XX: Update kconfig entries for PM
        [ARM] 4238/1: S3C24XX: docs: update suspend and resume
        [ARM] 4237/2: oprofile: Always allow backtraces on ARM
        [ARM] Yet more asm/apm-emulation.h stuff
        ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2
        ARM: OMAP: Use linux/delay.h not asm/delay.h
        ARM: OMAP: Remove obsolete alsa typedefs
        ARM: OMAP: omap1510->15xx conversions needed for sx1
        ARM: OMAP: Add missing includes to board-nokia770
        ARM: OMAP: Workqueue changes for board-h4.c
        ARM: OMAP: dmtimer.c omap1 register fix
        ARM: OMAP: board-nokia770: correct lcd name
        ...
      42270035
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 2c89a8d0
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] MTX1: clear PCI errors
        [MIPS] MTX1: add idsel cardbus ressources
        [MIPS] MTX1: remove unneeded settings
        [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
        [MIPS] Cobalt: update reserved resources
        [MIPS] SN: PCI fixup needs to include <irq.h>.
        [MIPS] DMA: Fix a bunch of warnings due to missing inline keywords.
        [MIPS] RM: It should be #ifdef CONFIG_FOO not #if CONFIG_FOO ...
        [MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
        [MIPS] DEC: Remove redeclarations of mips_machgroup and mips_machtype.
        [MIPS] No need to write c0_compare in plat_timer_setup
        [MIPS] Convert to RTC-class ds1742 driver
        [MIPS] Oprofile: Add missing break statements.
        [MIPS] jmr3927: build fix
        [MIPS] SNI: Fix mc146818_decode_year
        [MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.
        [MIPS] Replace sys32_socketcall with the generic compat_sys_socketcall.
        [MIPS] N32 waitid is the same as o32.
      2c89a8d0
    • Russell King's avatar
      [ARM] Acorn: move the i2c bus driver into drivers/i2c · 8d91cbad
      Russell King authored
      Move the Acorn IOC/IOMD I2C bus driver from drivers/i2c, strip
      out the reminants of the platform specific parts of the old
      PCF8583 RTC code, and remove the old obsolete PCF8583 driver.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      8d91cbad
    • Russell King's avatar
      [ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries · 23d046f4
      Russell King authored
      An off-by-one bug meant we were always trying to map one too many
      scatterlist entries.  This was mostly harmless prior to the checks
      going in to consistent_sync(), but now causes the kernel to BUG.
      
      Also, powertec.c was missing an assignment to info->ec.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      23d046f4
    • Russell King's avatar
      [ARM] ARM FAS216: don't modify scsi_cmnd request_bufflen · 6b4df7ee
      Russell King authored
      SCSI doesn't want drivers to modify request_bufflen, so keep a
      driver-private copy of this in the scsi_pointer structure instead.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      6b4df7ee
    • Russell King's avatar
      [ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC · bb71f99f
      Russell King authored
      Replace the I2C bus address, as per drivers/acorn/char/pcf8583.c.
      
      Also, since this driver also contains Acorn RiscPC specific code
      for obtaining the current year from the SRAM (and updating the
      platform specific checksum when writing new data back) this is
      NOT a platform independent driver.
      
      Document it as such, and update the dependencies to reflect this
      fact.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      bb71f99f
    • Russell King's avatar
      [ARM] rtc-pcf8583: correct month and year offsets · 0ed8f210
      Russell King authored
      No, today is not 4th April 3907, it's 4th March 2007.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      0ed8f210
    • Russell King's avatar
      [ARM] rtc-pcf8583: don't use BCD_TO_BIN/BIN_TO_BCD · f5e5b734
      Russell King authored
      Both BCD_TO_BIN(x) and BIN_TO_BCD(x) have an unexpected side-effect -
      not only do they return the value as expected, they _modify_ their
      argument in the process.
      
      Let's play it safe and avoid these macros.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      f5e5b734