1. 05 Mar, 2007 35 commits
  2. 04 Mar, 2007 5 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