01 Jun, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
    3c509: Add missing EISA IDs
    MAINTAINERS: take maintainership of the cpmac Ethernet driver
    net/firmare: Ignore .cis files
    ath1e: add new device id for asus hardware
    mlx4_en: Fix a kernel panic when waking tx queue
    rtl8187: add USB ID for Linksys WUSB54GC-EU v2 USB wifi dongle
    at76c50x-usb: avoid mutex deadlock in at76_dwork_hw_scan
    mac8390: fix build with NET_POLL_CONTROLLER
    cxgb3: link fault fixes
    cxgb3: fix dma mapping regression
    netfilter: nfnetlink_log: fix wrong skbuff size calculation
    netfilter: xt_hashlimit does a wrong SEQ_SKIP
    bfin_mac: fix build error due to net_device_ops convert
    atlx: move modinfo data from atlx.h to atl1.c
    gianfar: fix babbling rx error event bug
    cls_cgroup: read classid atomically in classifier
    netfilter: nf_ct_dccp: add missing DCCP protocol changes in event cache
    netfilter: nf_ct_tcp: fix accepting invalid RST segments

    Linus Torvalds
     
  • This patch adds me as the maintainer of the CPMAC (AR7)
    Ethernet driver.

    Signed-off-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Florian Fainelli
     

30 May, 2009

2 commits

  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
    fsldma: Fix compile warnings
    fsldma: fix memory leak on error path in fsl_dma_prep_memcpy()
    fsldma: snooping is not enabled for last entry in descriptor chain
    fsldma: fix infinite loop on multi-descriptor DMA chain completion
    fsldma: fix "DMA halt timeout!" errors
    fsldma: fix check on potential fdev->chan[] overflow
    fsldma: update mailling list address in MAINTAINERS

    Linus Torvalds
     
  • * master.kernel.org:/home/rmk/linux-2.6-arm:
    [ARM] update mach-types
    [ARM] Add cmpxchg support for ARMv6+ systems (v5)
    [ARM] barriers: improve xchg, bitops and atomic SMP barriers
    Gemini: Fix SRAM/ROM location after memory swap
    MAINTAINER: Add F: entries for Gemini and FA526
    [ARM] disable NX support for OABI-supporting kernels
    [ARM] add coherent DMA mask for mv643xx_eth
    [ARM] pxa/palm: fix PalmLD/T5/TX AC97 MFP
    [ARM] pxa: add parameter to clksrc_read() for pxa168/910
    [ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910}
    [ARM] Orion: Remove explicit name for platform device resources
    [ARM] Kirkwood: Correct MPP for SATA activity/presence LEDs of QNAP TS-119/TS-219.
    [ARM] pxa/ezx: fix pin configuration for low power mode
    [ARM] pxa/spitz: provide spitz_ohci_exit() that unregisters USB_HOST GPIO
    [ARM] pxa: enable GPIO receivers after configuring pins
    [ARM] pxa: allow gpio_reset drive high during normal work
    [ARM] pxa: save/restore PGSR on suspend/resume.

    Linus Torvalds
     

29 May, 2009

2 commits


28 May, 2009

1 commit


27 May, 2009

2 commits


24 May, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
    [SCSI] mpt2sas: fix driver version inconsistency
    [SCSI] 3w-xxxx: scsi_dma_unmap fix
    [SCSI] 3w-9xxx: scsi_dma_unmap fix
    [SCSI] ses: fix problems caused by empty SES provided name
    [SCSI] fc-transport: Close state transition-window during rport deletion.
    [SCSI] initialize max_target_blocked in scsi_alloc_target
    [SCSI] fnic: Add new Cisco PCI-Express FCoE HBA

    Linus Torvalds
     

22 May, 2009

2 commits


14 May, 2009

1 commit


05 May, 2009

1 commit


03 May, 2009

3 commits

  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
    ocfs2: Change repository in MAINTAINERS.
    ocfs2: Fix a missing credit when deleting from indexed directories.
    ocfs2/trivial: Remove unused variable in ocfs2_rename.
    ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock()
    ocfs2: Fix some printk() warnings.
    ocfs2: Fix 2 warning during ocfs2 make.
    ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.

    Linus Torvalds
     
  • Add Roland and Oleg as formal ptrace maintainers, they've been doing the
    job for a while.

    Includes the file patterns requested by Joe.

    Signed-off-by: Christoph Hellwig
    Acked-by: Roland McGrath
    Cc: Oleg Nesterov
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Christoph Hellwig
     
  • I will finish school soon, so replace my student address with this one.

    Signed-off-by: Florian Fainelli
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Florian Fainelli
     

01 May, 2009

2 commits


29 Apr, 2009

1 commit

  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    powerpc/ps3: Fix build error on UP
    powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
    powerpc: ppc32 needs elf_read_implies_exec()
    powerpc/86xx: Add device_type entry to soc for ppc9a
    powerpc/44x: Correct memory size calculation for denali-based boards
    maintainers: Fix PowerPC 4xx git tree
    powerpc: fix for long standing bug noticed by gcc 4.4.0
    Revert "powerpc: Add support for early tlbilx opcode"

    Linus Torvalds
     

24 Apr, 2009

5 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    MAINTAINERS: update IDE entry
    palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup
    palm_bk3710: those registers/bitfields don't exist
    mediabay: fix build for CONFIG_BLOCK=n
    ide: Stop disks on reboot for laptop which cuts power
    ide-cd: fix kernel crash on hppa regression
    palm_bk3710: UDMA performance fix

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (94 commits)
    netfilter: ctnetlink: fix gcc warning during compilation
    net/netrom: Fix socket locking
    netlabel: Always remove the correct address selector
    ucc_geth.c: Fix upsmr setting in RMII mode
    8139too: fix HW initial flow
    af_iucv: Fix race when queuing incoming iucv messages
    af_iucv: Test additional sk states in iucv_sock_shutdown
    af_iucv: Reject incoming msgs if RECV_SHUTDOWN is set
    af_iucv: fix oops in iucv_sock_recvmsg() for MSG_PEEK flag
    af_iucv: consider state IUCV_CLOSING when closing a socket
    iwlwifi: DMA fixes
    iwlwifi: add debugging for TX path
    mwl8: fix build warning.
    mac80211: fix alignment calculation bug
    mac80211: do not print WARN if config interface
    iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll
    iwlwifi: fix EEPROM validation mask to include OTP only devices
    atmel: fix netdev ops conversion
    pcnet_cs: add cis(firmware) of the Allied Telesis LA-PCM
    mlx4_en: Fix cleanup if workqueue create in mlx4_en_add() fails
    ...

    Linus Torvalds
     
  • * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
    powerpc: Fix modular build of ide-pmac when mediabay is built in
    powerpc/pasemi: Fix build error on UP
    powerpc: Make macintosh/mediabay driver depend on CONFIG_BLOCK
    maintainers: Fix PS3 patterns
    powerpc/ps3: Fix CONFIG_PS3_FLASH=n build warning
    powerpc/32: Don't clobber personality flags on exec
    powerpc: Fix crash on CPU hotplug
    powerpc/85xx: Remove defconfigs that mpc85xx_{smp_}defconfig cover
    powerpc/85xx: Added SMP defconfig
    powerpc/85xx: Enabled a bunch of FSL specific drivers/options
    powerpc/85xx: Updated generic mpc85xx_defconfig
    powerpc: don't disable SATA interrupts on Freescale MPC8610 HPCD
    fsl_rio: Pass the proper device to dma mapping routines
    powerpc: Fix of_node_put() exit path in of_irq_map_one()
    powerpc/5200: defconfig updates
    powerpc/5200: Add FLASH nodes to lite5200 device tree
    powerpc/device-tree: Document MTD nodes with multiple "reg" tuples
    powerpc/of-device-tree: Factor MTD physmap bindings out of booting-without-of
    powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back

    Linus Torvalds
     
  • Update the git tree URL for the PowerPC 4xx git tree.

    Reported-by: Denis ChengRq
    Signed-off-by: Josh Boyer

    Josh Boyer
     
  • By a popular demand quilt tree was replaced by a git one.

    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     

22 Apr, 2009

5 commits


20 Apr, 2009

1 commit


19 Apr, 2009

1 commit


18 Apr, 2009

1 commit

  • * master.kernel.org:/home/rmk/linux-2.6-arm: (48 commits)
    [ARM] S3C24XX: ADC: Check pending queue before freeing adc client
    [ARM] S3C: Fix ADC driver sparse warning
    [ARM] Osiris: Fix double initialisation in machine block
    [ARM] Anubis: Fix sparse warnings for items that should be static
    [ARM] JIVE: Fix sparse warnings about items which should be static
    [ARM] S3C: Fix sparse warning from missing 's3c_device_hwmon'
    [ARM] S3C24XX: Fix sparse error in gpiolib.c
    [ARM] 5455/1: Fix IRQ noise from VIC code
    [ARM] 5454/1: ep93xx_eth: fix sparse warnings
    [ARM] remove .gitignore from include/asm-arm
    Update MAINTAINERS
    mxc defconfig updates
    mx31ads: Mark as having full regulatoion constraints with 1133-EV1 board
    mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 board
    Fix ifdef in plat-mxc/irc.c
    MX1ADS: remove I2C ifdefs
    qong: remove AIPS[12] mappings from machine-specific iotable
    mx31ads: imoux pins should be passed in as unsigned int
    MXC: remove orphan imx_init_uart() definition
    mx31: pin definition for csi
    ...

    Linus Torvalds
     

17 Apr, 2009

3 commits


16 Apr, 2009

2 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits)
    phylib: Fix delay argument of schedule_delayed_work
    NET/ixgbe: Fix powering off during shutdown
    NET/e1000e: Fix powering off during shutdown
    NET/e1000: Fix powering off during shutdown
    packet: avoid warnings when high-order page allocation fails
    gianfar: stop send queue before resetting gianfar
    myr10ge: again fix lro_gen_skb() alignment
    declance: convert to net_device_ops
    bfin_mac: convert to net_device_ops
    au1000: convert to net_device_ops
    atarilance: convert to net_device_ops
    a2065: convert to net_device_ops
    ixgbe: update real_num_tx_queues on changing num_rx_queues
    ixgbe: fix tx queue index
    Revert "rose: zero length frame filtering in af_rose.c"
    sfc: Use correct macro to set event bitfield
    sfc: Match calls to netif_napi_add() and netif_napi_del()
    bonding: Remove debug printk
    e1000/e1000: fix compile warning
    ehea: Fix incomplete conversion to net_device_ops
    ...

    Linus Torvalds
     
  • Update rmk's email address, and expand on what he's responsible for.

    Signed-off-by: Russell King

    Russell King
     

15 Apr, 2009

2 commits

  • * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: Add missing FILE tag to MAINTAINERS
    microblaze: remove duplicated #include's
    microblaze: struct device - replace bus_id with dev_name()
    microblaze: Simplify copy_thread()
    microblaze: Add TIMESTAMPING constants to socket.h
    microblaze: Add missing empty ftrace.h file
    microblaze: Fix problem with removing zero length files

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
    sh: Add in PCI bus for DMA API debugging.
    sh: Pre-allocate a reasonable number of DMA debug entries.
    sh: sh7786: modify usb setup timeout judgment bug.
    MAINTAINERS: Update sh architecture file patterns.
    sh: ap325: use edge control for ov772x camera
    sh: Plug in support for ARCH=sh64 using sh SRCARCH.
    sh: urquell: Fix up address mapping in board comments.
    sh: Add support for DMA API debugging.
    sh: Provide cpumask_of_pcibus() to fix NUMA build.
    sh: urquell: Add board comment
    sh: wire up sys_preadv/sys_pwritev() syscalls.
    sh: sh7785lcr: fix PCI address map for 32-bit mode
    sh: intc: Added resume from hibernation support to the intc

    Linus Torvalds