1. 06 Jun, 2008 34 commits
  2. 05 Jun, 2008 6 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 39b945a3
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] pxa: fix tosa.c build error
        [ARM] 5067/1: _raw_write_can_lock macro bugfix
        [ARM] 5070/1: pxa: add GPIO104_PSKTSEL to pxa27x MFP configuration
        [ARM] 5068/1: PXA2xx Additional gpio definitions
        [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisation
        [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisation
        [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDP
        [ARM] 5060/1: remove unnecessary include of asm/io.h
        [ARM] fix AT91 include loops
      39b945a3
    • Ben Collins's avatar
      mmc: Fix crash in mmc_block on 64-bit · 203c8018
      Ben Collins authored
      Fairly simple. "dev_use" was being allocated as a zero length array
      because of bad math on 64-bit systems, causing a crash in
      find_first_zero_bit(). One-liner follows:
      Signed-off-by: default avatarBen Collins <ben.collins@canonical.com>
      Acked-by: default avatarPierre Ossman <drzeus@drzeus.cx>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      203c8018
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb · b2ab26ab
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (48 commits)
        V4L/DVB (8001): dib0070: fix dib0070_attach when !CONFIG_DVB_TUNER_DIB0070
        V4L/DVB (8000): tda827x: fix NULL pointer in tda827xa_lna_gain
        V4L/DVB (7990): Fix entry for PowerColor RA 330 and make it run with firmware version 2.7
        V4L/DVB (7983): tda18271_calc_rf_cal must return the return value of tda18271_lookup_map
        V4L/DVB (7978): cx18: explicitly test for XC2028 tuner
        V4L/DVB (7977): cx18: fix init order and remove duplicate open_on_first_use.
        V4L/DVB (7975): saa7134_empress
        V4L/DVB (7974): fix MEDIA_TUNER && FW_LOADER build error
        V4L/DVB (7972): or51132.c: unaligned
        V4L/DVB (7971): usb: unaligned
        V4L/DVB (7970): mix trivial endianness annotations
        V4L/DVB (7969): m920x: unaligned access
        V4L/DVB (7968): zoran: endianness annotations
        V4L/DVB (7967): bt8xx: unaligned access
        V4L/DVB (7966): cx18: direct dereferencing of iomem
        V4L/DVB (7965): annotate bcx_riscmem
        V4L/DVB (7964): cx18 iomem annotations
        V4L/DVB (7963): ivtv: trivial annotations
        V4L/DVB (7962): ttusb endianness annotations and fixes
        V4L/DVB (7961): fix endianness bug in dib0700_devices.c
        ...
      b2ab26ab
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 5965087d
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        Fix divide by zero error in build_clear_page() and build_copy_page()
        [MIPS] Fix typo in header guard
        [MIPS] Fix build error - Delete debugging crap that crept in with CMP
        [MIPS] Add accessors for random register.
        [MIPS] IP27: misc fixes
        [MIPS] IP27: Fix clockevent setup
        [MIPS] IP27: Fix bootmem memory setup
        [MIPS] remove CONFIG_CPU_R4000 line from Makefile
        [MIPS] Fix check for valid stack pointer during backtrace
        [MIPS] Add missing braces to pte_mkyoung
        [MIPS] R4700: Fix build_tlb_probe_entry
        [MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
        [MIPS] Alchemy: export get_au1x00_speed for modules
      5965087d
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/~dwmw2/mtd-2.6.26 · 698f7a4a
      Linus Torvalds authored
      * git://git.infradead.org/~dwmw2/mtd-2.6.26:
        [MTD] [MAPS] Fix cmdlineparse handling in mapping files
        [MTD] [NAND] pxa: fix incorrect calling of pxa3xx_nand_config() on resume path
      698f7a4a
    • Willy Tarreau's avatar
      doc: add suggestions about good practises for maintainers · adbd5886
      Willy Tarreau authored
      Suggest how to deal with patch modifications caused by
      merging or back-porting when you're a maintainer.
      Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      adbd5886