1. 05 Jan, 2009 21 commits
  2. 30 Dec, 2008 17 commits
  3. 29 Dec, 2008 2 commits
    • David S. Miller's avatar
      net: Fix unused variable warnings in pasemi_mac.c and spider_net.c · 59c5ea6e
      David S. Miller authored
      As reported by Stephen Rothwell:
      
      --------------------
      Today's linux-next build (powerpc ppc64_defconfig) produced these new
      warnings:
      
      drivers/net/pasemi_mac.c: In function 'pasemi_mac_rx_intr':
      drivers/net/pasemi_mac.c:957: warning: unused variable 'dev'
      drivers/net/pasemi_mac.c: In function 'pasemi_mac_poll':
      drivers/net/pasemi_mac.c:1637: warning: unused variable 'dev'
      drivers/net/spider_net.c: In function 'spider_net_poll':
      drivers/net/spider_net.c:1280: warning: unused variable 'netdev'
      
      Probably caused by commit 908a7a16 ("net:
      Remove unused netdev arg from some NAPI interfaces").
      --------------------
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      59c5ea6e
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 3c92ec8a
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
        powerpc/44x: Support 16K/64K base page sizes on 44x
        powerpc: Force memory size to be a multiple of PAGE_SIZE
        powerpc/32: Wire up the trampoline code for kdump
        powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
        powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
        powerpc/32: Setup OF properties for kdump
        powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
        powerpc: Prepare xmon_save_regs for use with kdump
        powerpc: Remove default kexec/crash_kernel ops assignments
        powerpc: Make default kexec/crash_kernel ops implicit
        powerpc: Setup OF properties for ppc32 kexec
        powerpc/pseries: Fix cpu hotplug
        powerpc: Fix KVM build on ppc440
        powerpc/cell: add QPACE as a separate Cell platform
        powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
        powerpc/mpc5200: fix error paths in PSC UART probe function
        powerpc/mpc5200: add rts/cts handling in PSC UART driver
        powerpc/mpc5200: Make PSC UART driver update serial errors counters
        powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
        powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
        ...
      
      Fix trivial conflict in drivers/char/Makefile as per Paul's directions
      3c92ec8a