27 Sep, 2010

1 commit


25 Sep, 2010

1 commit


24 Sep, 2010

1 commit

  • Change MSI LAPTOP driver maintainer from Lennart Poettering to Lee, Chun-Yi.

    MSI is a Taiwan OEM company, Lee, Chun-Yi can more easy to contact with MSI
    and maintain msi-laptop driver.
    Thank's for Lennart Poettering's contribute, Lee, Chun-Yi will base on his
    article to continue maintain the msi-laptop driver.

    Signed-off-by: Lee, Chun-Yi
    Signed-off-by: Matthew Garrett

    Lee, Chun-Yi
     

23 Sep, 2010

2 commits

  • Some Apple machines have identical DMI data but different memory
    configurations for the video. Given that, check that the address in our
    table is actually within the range of a PCI BAR on a VGA device in the
    machine.

    This also fixes up the return value from set_system(), which has always
    been wrong, but never resulted in bad behavior since there's only ever
    been one matching entry in the dmi table.

    The patch

    1) stops people's machines from crashing when we get their display wrong,
    which seems to be unfortunately inevitable,

    2) allows us to support identical dmi data with differing video memory
    configurations

    This also adds me as the efifb maintainer, since I've effectively been
    acting as such for quite some time.

    Signed-off-by: Peter Jones
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Peter Jones
     
  • Alter the maintainer of the AVR32 architecture and the AVR32/AT32AP
    machine support to me. Haavard is moving on to new challenges, and we've
    found it better to transfer the maintainer part to me. I will have good
    contact with Haavard anyway.

    Signed-off-by: Hans-Christian Egtvedt
    Acked-by: Haavard Skinnemoen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Hans-Christian Egtvedt
     

21 Sep, 2010

1 commit


20 Sep, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
    dca: disable dca on IOAT ver.3.0 multiple-IOH platforms
    netpoll: Disable IRQ around RCU dereference in netpoll_rx
    sctp: Do not reset the packet during sctp_packet_config().
    net/llc: storing negative error codes in unsigned short
    MAINTAINERS: move atlx discussions to netdev
    drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory
    drivers/net/eql.c: prevent reading uninitialized stack memory
    drivers/net/usb/hso.c: prevent reading uninitialized memory
    xfrm: dont assume rcu_read_lock in xfrm_output_one()
    r8169: Handle rxfifo errors on 8168 chips
    3c59x: Remove atomic context inside vortex_{set|get}_wol
    tcp: Prevent overzealous packetization by SWS logic.
    net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS
    phylib: fix PAL state machine restart on resume
    net: use rcu_barrier() in rollback_registered_many
    bonding: correctly process non-linear skbs
    ipv4: enable getsockopt() for IP_NODEFRAG
    ipv4: force_igmp_version ignored when a IGMPv3 query received
    ppp: potential NULL dereference in ppp_mp_explode()
    net/llc: make opt unsigned in llc_ui_setsockopt()
    ...

    Linus Torvalds
     

17 Sep, 2010

2 commits

  • Guenter Roeck volunteered to adopt the hwmon subsystem as long as he
    wasn't the only maintainer. As this was also my own condition, we can
    add the two of us as co-maintainers of the hwmon subsystem.

    Signed-off-by: Jean Delvare
    Acked-by: Guenter Roeck

    Jean Delvare
     
  • The atlx drivers are sufficiently mature that we no longer need a separate
    mailing list for them. Move the discussion to netdev, so we can decommission
    atl1-devel, which is now mostly spam.

    Signed-off-by: Chris Snook
    Signed-off-by: David S. Miller

    Chris Snook
     

11 Sep, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
    ipheth: remove incorrect devtype to WWAN
    MAINTAINERS: Add CAIF
    sctp: fix test for end of loop
    KS8851: Correct RX packet allocation
    udp: add rehash on connect()
    net: blackhole route should always be recalculated
    ipv4: Suppress lockdep-RCU false positive in FIB trie (3)
    niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL
    ipvs: fix active FTP
    gro: Re-fix different skb headrooms
    via-velocity: Turn scatter-gather support back off.
    ipv4: Fix reverse path filtering with multipath routing.
    UNIX: Do not loop forever at unix_autobind().
    PATCH: b44 Handle RX FIFO overflow better (simplified)
    irda: off by one
    3c59x: Fix deadlock in vortex_error()
    netfilter: discard overlapping IPv6 fragment
    ipv6: discard overlapping fragment
    net: fix tx queue selection for bridged devices implementing select_queue
    bonding: Fix jiffies overflow problems (again)
    ...

    Fix up trivial conflicts due to the same cgroup API thinko fix going
    through both Andrew and the networking tree. However, there were small
    differences between the two, with Andrew's version generally being the
    nicer one, and the one I merged first. So pick that one.

    Conflicts in: include/linux/cgroup.h and kernel/cgroup.c

    Linus Torvalds
     

10 Sep, 2010

4 commits


09 Sep, 2010

1 commit


08 Sep, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
    pkt_sched: Fix lockdep warning on est_tree_lock in gen_estimator
    ipvs: avoid oops for passive FTP
    Revert "sky2: don't do GRO on second port"
    gro: fix different skb headrooms
    bridge: Clear INET control block of SKBs passed into ip_fragment().
    3c59x: Remove incorrect locking; correct documented lock hierarchy
    sky2: don't do GRO on second port
    ipv4: minor fix about RPF in help of Kconfig
    xfrm_user: avoid a warning with some compiler
    net/sched/sch_hfsc.c: initialize parent's cl_cfmin properly in init_vf()
    pxa168_eth: fix a mdiobus leak
    net sched: fix kernel leak in act_police
    vhost: stop worker only if created
    MAINTAINERS: Add ehea driver as Supported
    ath9k_hw: fix parsing of HT40 5 GHz CTLs
    ath9k_hw: Fix EEPROM uncompress block reading on AR9003
    wireless: register wiphy rfkill w/o holding cfg80211_mutex
    netlink: Make NETLINK_USERSOCK work again.
    irda: Correctly clean up self->ias_obj on irda_bind() failure.
    wireless extensions: fix kernel heap content leak
    ...

    Linus Torvalds
     

04 Sep, 2010

1 commit


02 Sep, 2010

1 commit


31 Aug, 2010

1 commit


29 Aug, 2010

1 commit

  • * 'for-linus' of git://git.infradead.org/users/eparis/notify:
    fsnotify: drop two useless bools in the fnsotify main loop
    fsnotify: fix list walk order
    fanotify: Return EPERM when a process is not privileged
    fanotify: resize pid and reorder structure
    fanotify: drop duplicate pr_debug statement
    fanotify: flush outstanding perm requests on group destroy
    fsnotify: fix ignored mask handling between inode and vfsmount marks
    fanotify: add MAINTAINERS entry
    fsnotify: reset used_inode and used_vfsmount on each pass
    fanotify: do not dereference inode_mark when it is unset

    Linus Torvalds
     

27 Aug, 2010

1 commit


26 Aug, 2010

1 commit


25 Aug, 2010

1 commit


23 Aug, 2010

2 commits


21 Aug, 2010

1 commit


16 Aug, 2010

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: sound/usb/format: silence uninitialized variable warnings
    MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices
    MAINTAINERS: Make Wolfson entry also cover CODEC drivers
    ASoC: Only tweak WM8994 chip configuration on devices up to rev D
    ASoC: Optimise DSP performance for WM8994
    ALSA: hda - Fix dynamic ADC change working again
    ALSA: hda - Restrict PCM parameters per ELD information over HDMI
    sound: oss: sh_dac_audio.c removed duplicated #include

    Linus Torvalds
     

15 Aug, 2010

3 commits


13 Aug, 2010

2 commits


12 Aug, 2010

1 commit

  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (226 commits)
    ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    ARM: 6324/1: cam60: move cam60_spi_devices to .init.data
    ARM: 6322/1: imx/pca100: Fix name of spi platform data
    ARM: 6321/1: fix syntax error in main Kconfig file
    ARM: 6297/1: move U300 timer to dynamic clock lookup
    ARM: 6296/1: clock U300 intcon and timer properly
    ARM: 6295/1: fix U300 apb_pclk split
    ARM: 6306/1: fix inverted MMC card detect in U300
    ARM: 6299/1: errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID
    ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
    ARM: 6292/1: coresight: add ETM management registers
    ARM: 6288/1: ftrace: document mcount formats
    ARM: 6287/1: ftrace: clean up mcount assembly indentation
    ARM: 6286/1: fix Thumb-2 decompressor broken by "Auto calculate ZRELADDR"
    ARM: 6281/1: video/imxfb.c: allow usage without BACKLIGHT_CLASS_DEVICE
    ARM: 6280/1: imx: Fix build failure when including without
    ARM: S5PV210: Fix on missing s3c-sdhci card detection method for hsmmc3
    ARM: S5P: Fix on missing S5P_DEV_FIMC in plat-s5p/Kconfig
    ARM: S5PV210: Override FIMC driver name on Aquila board
    ARM: S5PC100: enable FIMC on SMDKC100
    ...

    Fix up conflicts in arch/arm/mach-{s5pc100,s5pv210}/cpu.c due to
    different subsystem 'setname' calls, and trivial port types in
    include/linux/serial_core.h

    Linus Torvalds
     

11 Aug, 2010

2 commits

  • Conflicts:
    arch/arm/Kconfig
    arch/arm/mm/Kconfig

    Russell King
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (94 commits)
    V4L/DVB: tvp7002: fix write to H-PLL Feedback Divider LSB register
    V4L/DVB: dvb: siano: free spinlock before schedule()
    V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
    V4L/DVB: drivers: usbvideo: remove custom implementation of hex_to_bin()
    V4L/DVB: Report supported QAM modes on bt8xx
    V4L/DVB: media: ir-keytable: null dereference in debug code
    V4L/DVB: ivtv: convert to the new control framework
    V4L/DVB: ivtv: convert gpio subdev to new control framework
    V4L/DVB: wm8739: convert to the new control framework
    V4L/DVB: cs53l32a: convert to new control framework
    V4L/DVB: wm8775: convert to the new control framework
    V4L/DVB: cx2341x: convert to the control framework
    V4L/DVB: cx25840: convert to the new control framework
    V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config
    V4L/DVB: saa717x: convert to the new control framework
    V4L/DVB: msp3400: convert to the new control framework
    V4L/DVB: saa7115: convert to the new control framework
    V4L/DVB: v4l2: hook up the new control framework into the core framework
    V4L/DVB: Documentation: add v4l2-controls.txt documenting the new controls API
    V4L/DVB: v4l2-ctrls: Whitespace cleanups
    ...

    Linus Torvalds
     

10 Aug, 2010

5 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (59 commits)
    igbvf.txt: Add igbvf Documentation
    igb.txt: Add igb documentation
    e100/e1000*/igb*/ixgb*: Add missing read memory barrier
    ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
    netxen: protect tx timeout recovery by rtnl lock
    isdn: gigaset: use after free
    isdn: gigaset: add missing unlock
    solos-pci: Fix race condition in tasklet RX handling
    pkt_sched: Fix sch_sfq vs tcf_bind_filter oops
    net: disable preemption before call smp_processor_id()
    tcp: no md5sig option size check bug
    iwlwifi: fix locking assertions
    iwlwifi: fix TX tracer
    isdn: fix information leak
    net: Fix napi_gro_frags vs netpoll path
    usbnet: remove noisy and hardly useful printk
    rtl8180: avoid potential NULL deref in rtl8180_beacon_work
    ath9k: Remove myself from the MAINTAINERS list
    libertas: scan before assocation if no BSSID was given
    libertas: fix association with some APs by using extended rates
    ...

    Linus Torvalds
     
  • [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Guenter Roeck
    Cc: Jean Delvare
    Cc: Randy Dunlap
    Cc: Hans de Goede
    Cc: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Guenter Roeck
     
  • This driver adds support for the monitoring features of the Summit
    Microelectronics SMM665 Six-Channel Active DC Output Controller/Monitor.

    Signed-off-by: Guenter Roeck
    Acked-by: Jonathan Cameron
    Cc: Jean Delvare
    Cc: Hans de Goede
    Cc: Mark Brown
    Cc: Samuel Ortiz
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Guenter Roeck
     
  • This old address bounces and Sergey doesn't answer at another email
    address.

    Signed-off-by: Joe Perches
    Cc: Sergey Kostyliov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Laurent is sending auto-replies with a new email address, so might as well
    update MAINTAINERS.

    Signed-off-by: Joe Perches
    Acked-by: Laurent Pinchart
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches