1. 21 10月, 2008 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 88e36621
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ASoC: OMAP: Fix DSP DAI format in McBSP DAI driver
        go7007 - Add missing dependency on sound subsystem
        ALSA: ps3: Add support for SPDIF/HDMI passthru
        ps3: Add passthru support for non-audio streams
        ps3: Add ps3av_audio_mute_analog()
        ALSA: misc typo fixes
        sound: add missing pcm kernel-doc
      88e36621
    • S
      staging: sxg depends on X86 · a1cf6494
      Stephen Rothwell 提交于
      sxghif.h has code that explicitly will not build fo other architecures.
      Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1cf6494
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 5fdf1128
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        netfilter: replace old NF_ARP calls with NFPROTO_ARP
        netfilter: fix compilation error with NAT=n
        netfilter: xt_recent: use proc_create_data()
        netfilter: snmp nat leaks memory in case of failure
        netfilter: xt_iprange: fix range inversion match
        netfilter: netns: use NFPROTO_NUMPROTO instead of NUMPROTO for tables array
        netfilter: ctnetlink: remove obsolete NAT dependency from Kconfig
        pkt_sched: sch_generic: Fix oops in sch_teql
        dccp: Port redirection support for DCCP
        tcp: Fix IPv6 fallout from 'Port redirection support for TCP'
        netdev: change name dropping error codes
        ipvs: Update CONFIG_IP_VS_IPV6 description and help text
      5fdf1128
    • L
      Merge git://git.infradead.org/mtd-2.6 · 2be508d8
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (69 commits)
        Revert "[MTD] m25p80.c code cleanup"
        [MTD] [NAND] GPIO driver depends on ARM... for now.
        [MTD] [NAND] sh_flctl: fix compile error
        [MTD] [NOR] AT49BV6416 has swapped erase regions
        [MTD] [NAND] GPIO NAND flash driver
        [MTD] cmdlineparts documentation change - explain where mtd-id comes from
        [MTD] cfi_cmdset_0002.c: Add Macronix CFI V1.0 TopBottom detection
        [MTD] [NAND] Fix compilation warnings in drivers/mtd/nand/cs553x_nand.c
        [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
        [MTD] mtdoops: Fix a bug where block may not be erased
        [MTD] mtdoops: Add a magic number to logged kernel oops
        [MTD] mtdoops: Fix an off by one error
        [JFFS2] Correct parameter names of jffs2_compress() in comments
        [MTD] [NAND] sh_flctl: add support for Renesas SuperH FLCTL
        [MTD] [NAND] Bug on atmel_nand HW ECC : OOB info not correctly written
        [MTD] [MAPS] Remove unused variable after ROM API cleanup.
        [MTD] m25p80.c extended jedec support (v2)
        [MTD] remove unused mtd parameter in of_mtd_parse_partitions()
        [MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE
        [MTD] [NAND] driver extension to support NAND on TQM85xx modules
        ...
      2be508d8
  2. 20 10月, 2008 36 次提交