1. 08 Dec, 2009 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d7fc02c7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
        mac80211: fix reorder buffer release
        iwmc3200wifi: Enable wimax core through module parameter
        iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
        iwmc3200wifi: Coex table command does not expect a response
        iwmc3200wifi: Update wiwi priority table
        iwlwifi: driver version track kernel version
        iwlwifi: indicate uCode type when fail dump error/event log
        iwl3945: remove duplicated event logging code
        b43: fix two warnings
        ipw2100: fix rebooting hang with driver loaded
        cfg80211: indent regulatory messages with spaces
        iwmc3200wifi: fix NULL pointer dereference in pmkid update
        mac80211: Fix TX status reporting for injected data frames
        ath9k: enable 2GHz band only if the device supports it
        airo: Fix integer overflow warning
        rt2x00: Fix padding bug on L2PAD devices.
        WE: Fix set events not propagated
        b43legacy: avoid PPC fault during resume
        b43: avoid PPC fault during resume
        tcp: fix a timewait refcnt race
        ...
      
      Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
      CTL_UNNUMBERED removed) in
      	kernel/sysctl_check.c
      	net/ipv4/sysctl_net_ipv4.c
      	net/ipv6/addrconf.c
      	net/sctp/sysctl.c
      d7fc02c7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · ee1262db
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
        sparc: Set UTS_MACHINE correctly.
        sparc,leon: init_leon srmmu cleanup
        sparc32: Remove early interrupt enable.
        sparc, leon: Added Aeroflex Gaisler entry in manufacturer_info structure
        sparc64: Faster early-boot framebuffer console.
        Revert "sparc: Make atomic locks raw"
        sparc: remove unused nfsd #includes
        sparc: Fixup last users of irq_chip->typename
        Added sparc_leon3_snooping_enabled() and converted extern inline to static inline
        No auxio on LEON
        apbuart: Use of_find_node_by_path to find root node.
        sparc: Replace old style lock initializer
        sparc: Make atomic locks raw
        apbuart: Fix build and missing driver unregister.
        apbuart: Kill dependency on deprecated Sparc-only PROM interfaces.
        apbuart: Fix build warning.
        sparc: Support for GRLIB APBUART serial port
        watchdog: Remove BKL from rio watchdog driver
        sparc: Remove BKL from apc
        sparc,leon: Sparc-Leon SMP support
      ee1262db
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · a421018e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (294 commits)
        S3C64XX: Staticise platform data for PCM devices
        ASoC: Rename controls with a / in wm_hubs
        snd-fm801: autodetect SF64-PCR (tuner-only) card
        ALSA: tea575x-tuner: fix mute
        ASoC: au1x: dbdma2: plug memleak in pcm device creation error path
        ASoC: au1x: dbdma2: fix oops on soc device removal.
        ALSA: hda - Fix memory leaks in the previous patch
        ALSA: hda - Add ALC661/259, ALC892/888VD support
        ALSA: opti9xx: remove snd_opti9xx fields
        ALSA: aaci - Clean up duplicate code
        ALSA: usb - Fix mixer map for Hercules Gamesurround Muse Pocket LT
        ALSA: hda - Add position_fix quirk for HP dv3
        ALSA: hda - Add a pin-fix for FSC Amilo Pi1505
        ALSA: hda - Fix Cxt5047 test mode
        ASoC: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
        ASoC: sh: fsi: Add runtime PM support
        sh: ms7724se: Add runtime PM support for FSI
        ALSA: hda - Add a position_fix quirk for MSI Wind U115
        ALSA: opti-miro: add PnP detection
        ALSA: opti-miro: separate comon probing code
        ...
      a421018e
    • Linus Torvalds's avatar
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 3ad1f3b3
      Linus Torvalds authored
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        of: merge of_find_all_nodes() implementations
        of: merge other miscellaneous prototypes
        of: merge of_*_flat_dt*() functions
        of: merge of_node_get(), of_node_put() and of_find_all_nodes()
        of: merge of_read_number() an of_read_ulong()
        of: merge of_node_*_flag() and set_node_proc_entry()
        of: merge struct boot_param_header from Microblaze and PowerPC
        of: add common header for flattened device tree representation
        of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h
        of: merge struct device_node
        of: merge phandle, ihandle and struct property
        of: Rework linux/of.h and asm/prom.h include ordering
      3ad1f3b3
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6 · 1557d330
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
        security/tomoyo: Remove now unnecessary handling of security_sysctl.
        security/tomoyo: Add a special case to handle accesses through the internal proc mount.
        sysctl: Drop & in front of every proc_handler.
        sysctl: Remove CTL_NONE and CTL_UNNUMBERED
        sysctl: kill dead ctl_handler definitions.
        sysctl: Remove the last of the generic binary sysctl support
        sysctl net: Remove unused binary sysctl code
        sysctl security/tomoyo: Don't look at ctl_name
        sysctl arm: Remove binary sysctl support
        sysctl x86: Remove dead binary sysctl support
        sysctl sh: Remove dead binary sysctl support
        sysctl powerpc: Remove dead binary sysctl support
        sysctl ia64: Remove dead binary sysctl support
        sysctl s390: Remove dead sysctl binary support
        sysctl frv: Remove dead binary sysctl support
        sysctl mips/lasat: Remove dead binary sysctl support
        sysctl drivers: Remove dead binary sysctl support
        sysctl crypto: Remove dead binary sysctl support
        sysctl security/keys: Remove dead binary sysctl support
        sysctl kernel: Remove binary sysctl logic
        ...
      1557d330
  2. 06 Dec, 2009 1 commit
    • David S. Miller's avatar
      sparc: Set UTS_MACHINE correctly. · 7f5620a5
      David S. Miller authored
      "ARCH" can be just about anything, so we shouldn't end up
      with UTS_MACHINE of "sparc" in a 64-bit kernel build just
      because someone set the personality using 'sparc32' or
      similar.  CONFIG_SPARC64 drives the compilation and
      therefore provides the definitive value, not "ARCH".
      
      This mirrors commit 8c6531f7
      (x86: correctly set UTS_MACHINE for "make ARCH=x86")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f5620a5
  3. 05 Dec, 2009 26 commits
  4. 04 Dec, 2009 8 commits