xfs
[Top] [All Lists]

[XFS updates] XFS development tree branch, for-linus-merged, created. v2

To: xfs@xxxxxxxxxxx
Subject: [XFS updates] XFS development tree branch, for-linus-merged, created. v2.6.37-rc4-5735-g92f1c00
From: xfs@xxxxxxxxxxx
Date: Tue, 11 Jan 2011 10:47:31 -0600
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".

The branch, for-linus-merged has been created
        at  92f1c008ae79e32b83c0607d184b194f302bb3ee (commit)

- Log -----------------------------------------------------------------
commit 92f1c008ae79e32b83c0607d184b194f302bb3ee
Merge: e54be894eae10eca9892e965cc9532f5d5a11767 
d0eb2f38b250b7d6c993adf81b0e4ded0565497e
Author: Alex Elder <aelder@xxxxxxx>
Date:   Mon Jan 10 21:35:55 2011 -0600

    Merge branch 'master' into for-linus-merged
    
    This merge pulls the XFS master branch into the latest Linus master.
    This results in a merge conflict whose best fix is not obvious.
    I manually fixed the conflict, in "fs/xfs/xfs_iget.c".
    
    Dave Chinner had done work that resulted in RCU freeing of inodes
    separate from what Nick Piggin had done, and their results differed
    slightly in xfs_inode_free().  The fix updates Nick's call_rcu()
    with the use of VFS_I(), while incorporating needed updates to some
    XFS inode fields implemented in Dave's series.  Dave's RCU callback
    function has also been removed.
    
    Signed-off-by: Alex Elder <aelder@xxxxxxx>

commit e54be894eae10eca9892e965cc9532f5d5a11767
Merge: 949f6711b83d2809d1ccb9d830155a65fdacdff9 
c6c0ac664c86ff6408fadbed4913938c8a732e26
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 16:10:33 2011 -0800

    Merge branch 'driver-core-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
    
    * 'driver-core-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      driver core: Document that device_rename() is only for networking
      sysfs: remove useless test from sysfs_merge_group
      driver-core: merge private parts of class and bus
      driver core: fix whitespace in class_attr_string

commit 949f6711b83d2809d1ccb9d830155a65fdacdff9
Merge: 443e6221e465efa8efb752a8405a759ef1161af9 
7959d55679e4360205c9ebc89d40a5503c53bae2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 16:04:53 2011 -0800

    Merge branch 'staging-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
    
    * 'staging-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
      staging: speakup: fix failure handling
      staging: usbip: remove double giveback of URB
      Staging: batman-adv: Remove batman-adv from staging
      Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL 
on initialize
      staging: hv: remove unneeded osd_schedule_callback
      staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
      staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
      staging: brcm80211: Fix WL_<type> logging macros
      Staging: IIO: DDS: AD9833 / AD9834 driver
      Staging: IIO: dds.h convenience macros
      Staging: IIO: Direct digital synthesis abi documentation
      staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
      staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
      staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
      staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
      staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
      staging: brcm80211: Remove unused ether_<foo> #defines and struct
      staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
      staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
      Staging: comedi: Fix checkpatch.pl issues in file s526.c
      ...
    
    Fix up trivial conflict in drivers/video/udlfb.c

commit 443e6221e465efa8efb752a8405a759ef1161af9
Merge: 0caca697a2d173c6beff3c24e7d9481b732bd131 
1a7d946993aaf2a79e9c65abbe169a108e351bcb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 15:39:48 2011 -0800

    Merge branch 'for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 
commits)
      sony-laptop: support new hotkeys on the P, Z and EC series
      platform/x86: Consistently select LEDS Kconfig options
      sony-laptop: fix sparse non-ANSI function warning
      intel_ips: fix sparse non-ANSI function warning
      Support KHLB2 in the compal laptop driver
      acer-wmi: Enabled Acer Launch Manager mode
      [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel 
irq subsystem
      ACPI Thinkpad: We must always call va_end() after va_start() but do not 
do so in thinkpad_acpi.c::acpi_evalf()
      acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
      acer-wmi: Detect the WiFi/Bluetooth/3G devices available
      acer-wmi: Add 3G rfkill sysfs file
      acer-wmi: Add acer wmi hotkey events support
      platform/x86: Kconfig: Replace select by depends on ACPI_WMI
      ideapad: pass ideapad_priv as argument (part 2)
      ideapad: pass ideapad_priv as argument (part 1)
      ideapad: add markups, unify comments and return result when init
      ideapad: add hotkey support
      ideapad: let camera power control entry under platform driver
      ideapad: add platform driver for ideapad
      fujitsu-laptop: fix compiler warning on pnp_ids
      ...

commit 0caca697a2d173c6beff3c24e7d9481b732bd131
Merge: ecacc6c70cf77a52a22af66c879873202522d6ce 
751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 15:39:23 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68knommu: Need to check __get_user()/__put_user() result
      m68knommu: signal.c __user annotations
      m68knommu: Equivalent of "m68k: handle new gcc's"
      m68knommu: f_pcr has been gone since headers' merge
      m68knommu: Don't lose state if sigframe setup fails
      m68knommu: Handle multiple pending signals
      m68knommu: Switch to saner sigsuspend
      m68knommu: Don't bother with SA_ONESHOT
      m68k: Check __get_user()/__put_user() return value
      m68k: Missing syscall_trace() on sigreturn
      m68k: Fix stack mangling logics in sigreturn
      m68k: If we fail to set sigframe up, just leave regs alone...
      m68k: Don't lose state if sigframe setup fails
      m68k: Simplify the singlestepping handling in signals
      m68k: Switch to saner sigsuspend()
      m68k: Resetting sa_handler in local copy of k_sigaction is pointless
      m68k/sun3: Kill pte_unmap() warnings

commit ecacc6c70cf77a52a22af66c879873202522d6ce
Merge: e773202e227c8ebbf369b9b924e15cca4d93824b 
4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 14:52:44 2011 -0800

    Merge branch 'release' of 
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Avoid array overflow if there are too many cpus in SRAT table
      [IA64] Remove unlikely from cpu_is_offline
      [IA64] irq_ia64, use set_irq_chip
      [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
      [IA64] eliminate race condition in smp_flush_tlb_mm

commit e773202e227c8ebbf369b9b924e15cca4d93824b
Merge: abf8792d0e1b203e303ed1c02437e0e10a39dcda 
d2a40972ec70bd2060d3c46050a101a9678d2991
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 14:50:38 2011 -0800

    Merge branch 'for-torvalds' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
    
    * 'for-torvalds' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
      ux500: allow 5500 and 8500 to be built together
      ux500: modem_irq is only for 5500
      ux500: dynamic SOC detection
      ux500: rename MOP board Kconfig
      ux500: remove build-time changing macros

commit abf8792d0e1b203e303ed1c02437e0e10a39dcda
Merge: e0e736fc0d33861335e2a132e4f688f7fd380c61 
e14411da420bad7bdaae65cccd8787674e6c565e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 14:50:08 2011 -0800

    Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm
    
    * 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
      msm: add SMP support for msm
      msm: hotplug: support cpu hotplug on msm
      msm: timer: SMP timer support for msm
      msm: scm-boot: Support for setting cold/warm boot addresses
      msm: Secure Channel Manager (SCM) support

commit 7959d55679e4360205c9ebc89d40a5503c53bae2
Author: William Hubbs <w.d.hubbs@xxxxxxxxx>
Date:   Thu Dec 16 13:26:58 2010 -0600

    staging: speakup: fix failure handling
    
    fix the failure handling in kobjects and the main function so that we
    release the virtual keyboard if we exit due to another failure.
    
    Signed-off-by: William Hubbs <w.d.hubbs@xxxxxxxxx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

commit 7571f089d7522a95c103558faf313c7af8856ceb
Author: Márton Németh <nm127@xxxxxxxxxxx>
Date:   Mon Dec 13 21:59:09 2010 +0100

    staging: usbip: remove double giveback of URB
    
    In the vhci_urb_dequeue() function the TCP connection is checked twice.
    Each time when the TCP connection is closed the URB is unlinked and given
    back. Remove the second attempt of unlinking and giving back of the URB 
completely.
    
    This patch fixes the bug described at 
https://bugzilla.kernel.org/show_bug.cgi?id=24872 .
    
    Signed-off-by: Márton Németh <nm127@xxxxxxxxxxx>
    Cc: stable <stable@xxxxxxxxxx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

commit e0e736fc0d33861335e2a132e4f688f7fd380c61
Merge: a08948812b30653eb2c536ae613b635a989feb6f 
aeda4ac3efc29e4d55989abd0a73530453aa69ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 11:18:59 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 
commits)
      MAINTAINERS: Add tomoyo-dev-en ML.
      SELinux: define permissions for DCB netlink messages
      encrypted-keys: style and other cleanup
      encrypted-keys: verify datablob size before converting to binary
      trusted-keys: kzalloc and other cleanup
      trusted-keys: additional TSS return code and other error handling
      syslog: check cap_syslog when dmesg_restrict
      Smack: Transmute labels on specified directories
      selinux: cache sidtab_context_to_sid results
      SELinux: do not compute transition labels on mountpoint labeled 
filesystems
      This patch adds a new security attribute to Smack called SMACK64EXEC. It 
defines label that is used while task is running.
      SELinux: merge policydb_index_classes and policydb_index_others
      selinux: convert part of the sym_val_to_name array to use flex_array
      selinux: convert type_val_to_struct to flex_array
      flex_array: fix flex_array_put_ptr macro to be valid C
      SELinux: do not set automatic i_ino in selinuxfs
      selinux: rework security_netlbl_secattr_to_sid
      SELinux: standardize return code handling in selinuxfs.c
      SELinux: standardize return code handling in selinuxfs.c
      SELinux: standardize return code handling in policydb.c
      ...

commit d2a40972ec70bd2060d3c46050a101a9678d2991
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date:   Wed Dec 8 11:08:01 2010 +0530

    ux500: allow 5500 and 8500 to be built together
    
    Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 5ec65521c99178a87f4c859101a92c36f4701fd7
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date:   Wed Dec 8 11:08:00 2010 +0530

    ux500: modem_irq is only for 5500
    
    Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
    [Modified to hit the right file]
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit abf12d719a2c9e45f7f90c02a3a25107206ed57a
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date:   Wed Dec 8 11:07:59 2010 +0530

    ux500: dynamic SOC detection
    
    Dynamically detect the DBx500 SOC an revision based on the ASIC ID.
    
    Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 5dc55e0a39434ec8bec7978aef2dc00c91a530ba
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date:   Wed Dec 8 11:07:58 2010 +0530

    ux500: rename MOP board Kconfig
    
    Rename the MOP board Kconfig entries to the same name as the machine
    type, so that the machine_is_*() macros work correctly.
    
    Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
    [Updated to match changes in the tree]
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 92389ca8362c42952c7ebb8a0350ac522dcde0f4
Author: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
Date:   Wed Dec 8 11:07:57 2010 +0530

    ux500: remove build-time changing macros
    
    To allow the possiblity of building U8500 and U5500 support in the same
    image.
    
    Signed-off-by: Rabin Vincent <rabin.vincent@xxxxxxxxxxxxxx>
    [Rebased to latest changes in Russells tree]
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 1a7d946993aaf2a79e9c65abbe169a108e351bcb
Author: Mattia Dongili <malattia@xxxxxxxx>
Date:   Sat Jan 8 18:47:29 2011 +0900

    sony-laptop: support new hotkeys on the P, Z and EC series
    
    Add new mappings for assist, VAIO, zoom and eject buttons present on
    refurbished P, Z and EC models.
    
    Reported-by: Gyorgy Jeney <nog.lkml@xxxxxxxxx>
    Reported-by: Stephan Mueller <smueller@xxxxxxxxxx>
    Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
    Cc: Matthew Garrett <mjg@xxxxxxxxxx>
    Signed-off-by: Mattia Dongili <malattia@xxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit a08948812b30653eb2c536ae613b635a989feb6f
Merge: 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281 
6099469805c24af14250e182bb9ca082b8a6b716
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:57:46 2011 -0800

    Merge branch 'hwmon-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
    
    * 'hwmon-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
      hwmon: Support for Dallas Semiconductor DS620
      hwmon: driver for Sensirion SHT21 humidity and temperature sensor
      hwmon: Add humidity attribute to sysfs ABI
      hwmon: sysfs ABI updates
      hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
      hwmon: (lm95241) Rewrite to avoid using macros
      hwmon: (applesmc) Fix checkpatch errors and fix value range checks
      hwmon: (applesmc) Update copyright information
      hwmon: (applesmc) Silence driver
      hwmon: (applesmc) Simplify feature sysfs handling
      hwmon: (applesmc) Dynamic creation of fan files
      hwmon: (applesmc) Extract all features generically
      hwmon: (applesmc) Handle new temperature format
      hwmon: (applesmc) Dynamic creation of temperature files
      hwmon: (applesmc) Introduce a register lookup table
      hwmon: (applesmc) Use pr_fmt and pr_<level>
      hwmon: (applesmc) Relax the severity of device init failure
      hwmon: (applesmc) Add MacBookAir3,1(3,2) support
      hwmon: (w83627hf) Use pr_fmt and pr_<level>
      hwmon: (w83627ehf) Use pr_fmt and pr_<level>
      ...

commit 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281
Merge: 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1 
a081748735c5feb96b1365e78a5ff0fb6ca7e3a4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:57:03 2011 -0800

    Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
    
    * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
      of/flattree: forward declare struct device_node in of_fdt.h
      ipmi: explicitly include of_address.h and of_irq.h
      sparc: explicitly cast negative phandle checks to s32
      powerpc/405: Fix missing #{address,size}-cells in i2c node
      powerpc/5200: dts: refactor dts files
      powerpc/5200: dts: Change combatible strings on localbus
      powerpc/5200: dts: remove unused properties
      powerpc/5200: dts: rename nodes to prepare for refactoring dts files
      of/flattree: Update dtc to current mainline.
      of/device: Don't register disabled devices
      powerpc/dts: fix syntax bugs in bluestone.dts
      of: Fixes for OF probing on little endian systems
      of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
      of/flattree: Add of_flat_dt_match() helper function
      of_serial: explicitly include of_irq.h
      of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
      of/flattree: Reorder unflatten_dt_node
      of/flattree: Refactor unflatten_dt_node
      of/flattree: Add non-boottime device tree functions
      of/flattree: Add Kconfig for EARLY_FLATTREE
      ...
    
    Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.

commit 0c51a4d8abd6ed5ba55f828840c6b78ab672644b
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 14:37:02 2011 +0000

    platform/x86: Consistently select LEDS Kconfig options
    
    Currently the x86 platform devices are not consistent about selecting
    or depending on the LEDs Kconfig variables, and this inconsistency
    leads to Kconfig getting upset and refusing to offer LEDs (even on
    non-x86 platforms):
    
    drivers/platform/x86/Kconfig:422:error: recursive dependency detected!
    drivers/platform/x86/Kconfig:422:       symbol EEEPC_WMI depends on ACPI_WMI
    drivers/platform/x86/Kconfig:438:       symbol ACPI_WMI is selected by 
ACER_WMI
    drivers/platform/x86/Kconfig:18:        symbol ACER_WMI depends on 
LEDS_CLASS
    drivers/leds/Kconfig:10:        symbol LEDS_CLASS is selected by EEEPC_WMI
    
    Fix this by always selecting rather than depending on the symbols as
    slightly more drivers use this approach already and it seems more
    user friendly.
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit a46a780835f394869e1fbbef8b528a1e02193e78
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:56:44 2011 -0800

    sony-laptop: fix sparse non-ANSI function warning
    
    Fix sparse warning for non-ANSI function declaration:
    
    drivers/platform/x86/sony-laptop.c:1134:35: warning: non-ANSI function 
declaration of function 'sony_nc_rfkill_update'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: Matthew Garrett <mjg@xxxxxxxxxx>
    Cc: Mattia Dongili <malattia@xxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 7027d8b570244f0fa3aaebccf0bcd8e95e172631
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:55:40 2011 -0800

    intel_ips: fix sparse non-ANSI function warning
    
    Fix sparse warning for non-ANSI function declaration:
    
    drivers/platform/x86/intel_ips.c:1477:25: warning: non-ANSI function 
declaration of function 'ips_link_to_i915_driver'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: Matthew Garrett <mjg@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date:   Mon Jan 10 08:18:25 2011 +0200

    headers: kobject.h redux
    
    Remove kobject.h from files which don't need it, notably,
    sched.h and fs.h.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 37721e1b0cf98cb65895f234d8c500d270546529
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date:   Mon Jan 10 08:17:10 2011 +0200

    headers: path.h redux
    
    Remove path.h from sched.h and other files.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 9f99a2f0e44663517b99b69a3e4a499d0ba877df
Merge: 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 
110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:48:46 2011 -0800

    Merge branch 'stable/bug-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'stable/bug-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/event: validate irq before get evtchn by irq
      xen/fb: fix potential memory leak
      xen/fb: fix xenfb suspend/resume race.
      xen: disable ACPI NUMA for PV guests
      xen/irq: Cleanup the find_unbound_irq

commit 8c8ae4e8cd5a67467192f3361eeec463694f8ed8
Merge: a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 
d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:48:29 2011 -0800

    Merge branch 'stable/generic' of 
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
    
    * 'stable/generic' of 
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen: HVM X2APIC support
      apic: Move hypervisor detection of x2apic to hypervisor.h

commit a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9
Merge: e3166331a3288dd7184548896a1c7ab682f0dbe8 
a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:38:01 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slub: Fix a crash during slabinfo -v
      tracing/slab: Move kmalloc tracepoint out of inline code
      slub: Fix slub_lock down/up imbalance
      slub: Fix build breakage in Documentation/vm
      slub tracing: move trace calls out of always inlined functions to reduce 
kernel code size
      slub: move slabinfo.c to tools/slub/slabinfo.c

commit e3166331a3288dd7184548896a1c7ab682f0dbe8
Merge: 1693ed284f14a288c29f7265f9d71103e4c10821 
0719e1d23aab3b445c823404fd1b8b027757bb0a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:29:25 2011 -0800

    Merge branch 'misc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      Documentation/kbuild: add info that 'choice' can have a symbol name
      kbuild: add numeric --set-val option to scripts/config
      headers_check: Fix warning text
      headers_check: better search for functions in headers
      scripts/coccinelle: update for compatability with Coccinelle 0.2.4
      tags: put function prototypes back!
      Kconfig: fix single letter command in scripts/config
      gitignore: add scripts/recordmcount

commit 1693ed284f14a288c29f7265f9d71103e4c10821
Merge: f28b1c8aaa97a68028bb894bffb1690185c62b01 
ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:28:38 2011 -0800

    Merge branch 'packaging' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'packaging' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
      deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
      kbuild: create linux-headers package in deb-pkg
      kbuild, deb-pkg: support overriding userland architecture
      kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
      kbuild, deb-pkg: Fix build with paranoid umask

commit f28b1c8aaa97a68028bb894bffb1690185c62b01
Merge: 0c05384a5a1af2352b8c244cf32f480ba6cbf024 
39177ec36236fb71257e51d0d198437b84170911
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:28:17 2011 -0800

    Merge branch 'kconfig' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'kconfig' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      nconf: handle comment entries within choice/endchoice
      kconfig: fix warning
      kconfig: Make expr_copy() take a const argument
      kconfig: simplify select-with-unmet-direct-dependency warning
      kconfig: add more S_INT and S_HEX consistency checks
      kconfig: fix `zconfdebug' extern declaration
      kconfig/conf: merge duplicate switch's case
      kconfig: fix typos
      kbuild/gconf: add dummy inline for bind_textdomain_codeset()
      kbuild/nconf: fix spaces damage
      kconfig: nuke second argument of conf_write_symbol()
      kconfig: do not define AUTOCONF_INCLUDED
      kconfig: the day kconfig warns about "select"-abuse has come

commit 0c05384a5a1af2352b8c244cf32f480ba6cbf024
Merge: 1542dec1c9109fdcd1c53460f064096f24fc49d2 
bc91c9f313309915f6ec767f56f78dcd0305b20f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:27:52 2011 -0800

    Merge branch 'kbuild' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'kbuild' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      mkuboot.sh: Fail if mkimage is missing
      gen_init_cpio: checkpatch fixes
      gen_init_cpio: Avoid race between call to stat() and call to open()
      modpost: Fix address calculation in reloc_location()
      Make fixdep error handling more explicit
      checksyscalls: Fix stand-alone usage
      modpost: Put .zdebug* section on white list
      kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
      kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
      kbuild: introduce HDR_ARCH_LIST for headers_install_all
      headers_install: check exit status of unifdef
      gen_init_cpio: remove leading `/' from file names
      scripts/genksyms: fix header usage
      fixdep: use hash table instead of a single array

commit 1542dec1c9109fdcd1c53460f064096f24fc49d2
Merge: facc7a96d443d84060a8679c3fcc51d20d4981c3 
2ad2c320a107aceeba984f97ab2a60064101f5d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:22:33 2011 -0800

    Merge branch 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
      pata_hpt37x: actually limit HPT370 to UltraDMA/66
      pata_hpt3x2n: coding style cleanup
      pata_hpt37x: coding style cleanup
      pata_hpt366: coding style cleanup
      pata_hpt3x2n: calculate average f_CNT
      pata_hpt3x2n: clarify about HPT371N support
      pata_hpt{37x|3x2n}: SATA mode filtering
      [libata] avoid needlessly passing around ptr to SCSI completion func
      [libata] new driver acard_ahci, for ATP8620 host controller

commit facc7a96d443d84060a8679c3fcc51d20d4981c3
Merge: c8940eca75e6d1ea57f6c491a30bd1023c64c9ad 
4ead36407b41eae942c8c9f70ef963cd369c90e2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:15:37 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: 
(34 commits)
      HID: roccat: Update sysfs attribute doc
      HID: roccat: don't use #pragma pack
      HID: roccat: Add support for Roccat Kone[+] v2
      HID: roccat: reduce number of functions in kone and pyra drivers
      HID: roccat: declare meaning of pack pragma usage in driver headers
      HID: roccat: use class for char device for sysfs attribute creation
      sysfs: Introducing binary attributes for struct class
      HID: hidraw: add compatibility ioctl() for 32-bit applications.
      HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
      HID: picolcd: fix misuse of logical operation in place of bitop
      HID: usbhid: base runtime PM on modern API
      HID: replace offsets values with their corresponding BTN_* defines
      HID: hid-mosart: support suspend/resume
      HID: hid-mosart: ignore buttons report
      HID: hid-picolcd: don't use flush_scheduled_work()
      HID: simplify an index check in hid_lookup_collection
      HID: Hoist assigns from ifs
      HID: Remove superfluous __inline__
      HID: Use vzalloc for vmalloc/memset(,0...)
      HID: Add and use hid_<level>: dev_<level> equivalents
      ...

commit c8940eca75e6d1ea57f6c491a30bd1023c64c9ad
Merge: 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 
3ae22e8c8ac39daf88ae32f047fb23825be7c646
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:14:53 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      spi / PM: Support dev_pm_ops
      PM: Prototype the pm_generic_ operations
      PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
      PM: Use dev_name() in core device suspend and resume routines
      PM: Permit registration of parentless devices during system suspend
      PM: Replace the device power.status field with a bit field
      PM: Remove redundant checks from core device resume routines
      PM: Use a different list of devices for each stage of device suspend
      PM: Avoid compiler warning in pm_noirq_op()
      PM: Use pm_wakeup_pending() in __device_suspend()
      PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
      PM: Prevent dpm_prepare() from returning errors unnecessarily
      PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
      PM / Runtime: Add synchronous runtime interface for interrupt handlers 
(v3)
      PM / Hibernate: When failed, in_suspend should be reset
      PM / Hibernate: hibernation_ops->leave should be checked too
      Freezer: Fix a race during freezing of TASK_STOPPED tasks
      PM: Use proper ccflag flag in kernel/power/Makefile
      PM / Runtime: Fix comments to match runtime callback code

commit 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252
Merge: b65f0d673a0280a49b80f44c9a62e5dfc1ec203f 
410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 08:14:02 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: use split transaction timeout only for split transactions
      firewire: ohci: consolidate context status flags
      firewire: ohci: cache the context run bit
      firewire: ohci: flush AT contexts after bus reset - addendum
      firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
      firewire: net: set carrier state at ifup
      firewire: net: add carrier detection
      firewire: net: ratelimit error messages
      firewire: ohci: restart iso DMA contexts on resume from low power mode
      firewire: ohci: restore GUID on resume.
      firewire: ohci: use common buffer for self IDs and AR descriptors
      firewire: ohci: optimize iso context checks in the interrupt handler
      firewire: make PHY packet header format consistent
      firewire: ohci: properly clear posted write errors
      firewire: ohci: flush MMIO writes in the interrupt handler
      firewire: ohci: fix AT context initialization error handling
      firewire: ohci: Asynchronous Reception rewrite
      firewire: core: Update WARN uses
      firewire: nosy: char device is not seekable

commit b65f0d673a0280a49b80f44c9a62e5dfc1ec203f
Merge: f3ea597251ac859a1c0e7b9e266877f1ac828009 
365e215ce1f154e288ff0f7c9acbdf5421f57949
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 07:50:40 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: unfold nilfs_dat_inode function
      nilfs2: do not pass sbi to functions which can get it from inode
      nilfs2: get rid of nilfs_mount_options structure
      nilfs2: simplify nilfs_mdt_freeze_buffer
      nilfs2: get rid of loaded flag from nilfs object
      nilfs2: fix a checkpatch error in page.c
      nilfs2: fiemap support
      nilfs2: mark buffer heads as delayed until the data is written to disk
      nilfs2: call nilfs_error inside bmap routines
      fs/nilfs2/super.c: Use printf extension %pV
      MAINTAINERS: add nilfs2 git tree entry

commit f3ea597251ac859a1c0e7b9e266877f1ac828009
Merge: f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a 
20054bd65703f7504a9daceabc2a060828fde36c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 07:47:11 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: use CreationTime like an i_generation field
      cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
      cifs: show "acl" in DebugData Features when it's compiled in
      cifs: move "ntlmssp" and "local_leases" options out of experimental code
      cifs: replace some hardcoded values with preprocessor constants
      cifs: remove unnecessary locking around sequence_number
      [CIFS] Fix minor merge conflict in fs/cifs/dir.c
      CIFS: Simplify cifs_open code
      CIFS: Simplify non-posix open stuff (try #2)
      CIFS: Add match_port check during looking for an existing connection (try 
#4)
      CIFS: Simplify ipv*_connect functions into one (try #4)
      cifs: Support NTLM2 session security during NTLMSSP authentication [try 
#5]
      cifs: don't overwrite dentry name in d_revalidate

commit 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date:   Fri Jan 7 14:50:12 2011 +0800

    xen/event: validate irq before get evtchn by irq
    
    When retrieving the event channel number from irq, the irq
    number may not be valid under some conditions.
    
    So far that can be when we suspend/resume and irq ends with -1.
    Validate and return sanitized irq and provide diagnostics information.
    
    [v3: added unlikely on the WARN path]
    [v2: reworded the commit message]
    Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
    Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

commit fc550e95921e109f3778a6b2dc560d63388810ab
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date:   Fri Jan 7 18:20:54 2011 +0800

    xen/fb: fix potential memory leak
    
    This patch fixes a potential memory leak when xenfb connect to
    the backend fails.
    
    Thanks for Ian's review and comments.
    
    [v2: reworded the commit message a bit]
    
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
    Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

commit 731f3ab66a23dab28a359e87364f53d221b3d366
Author: Joe Jin <joe.jin@xxxxxxxxxx>
Date:   Fri Jan 7 18:17:17 2011 +0800

    xen/fb: fix xenfb suspend/resume race.
    
    When migrating guests over a long period we hit this:
    
    <1>BUG: unable to handle kernel paging request at 0000000b819fdb98
    <1>IP: [<ffffffff812a588f>] notify_remote_via_irq+0x13/0x34
    <4>PGD 94b10067 PUD 0
    <0>Oops: 0000 [#1] SMP
    .. snip..
    Call Trace:
     [<ffffffff812712c9>] xenfb_send_event+0x5c/0x5e
     [<ffffffff8100ea5f>] ? xen_restore_fl_direct_end+0x0/0x1
     [<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
     [<ffffffff812714ee>] xenfb_refresh+0x1b1/0x1d7
     [<ffffffff81270568>] ? sys_imageblit+0x1ac/0x458
     [<ffffffff81271786>] xenfb_imageblit+0x2f/0x34
     [<ffffffff8126a3e5>] soft_cursor+0x1b5/0x1c8
     [<ffffffff8126a137>] bit_cursor+0x4b6/0x4d7
     [<ffffffff8100ea5f>] ? xen_restore_fl_direct_end+0x0/0x1
     [<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
     [<ffffffff81269c81>] ? bit_cursor+0x0/0x4d7
     [<ffffffff812656b7>] fb_flashcursor+0xff/0x111
     [<ffffffff812655b8>] ? fb_flashcursor+0x0/0x111
     [<ffffffff81071812>] worker_thread+0x14d/0x1ed
     [<ffffffff81075a8c>] ? autoremove_wake_function+0x0/0x3d
     [<ffffffff81438d80>] ? _spin_unlock_irqrestore+0x16/0x18
     [<ffffffff810716c5>] ? worker_thread+0x0/0x1ed
     [<ffffffff810756e3>] kthread+0x6e/0x76
     [<ffffffff81012dea>] child_rip+0xa/0x20
     [<ffffffff81011fd1>] ? int_ret_from_sys_call+0x7/0x1b
     [<ffffffff8101275d>] ? retint_restore_args+0x5/0x6
     [<ffffffff81012de0>] ? child_rip+0x0/0x20
    Code: 6b ff 0c 8b 87 a4 db 9f 81 66 85 c0 74 08 0f b7 f8 e8 3b ff ff ff c9
    c3 55 48 89 e5 48 83 ec 10 0f 1f 44 00 00 89 ff 48 6b ff 0c <8b> 87 a4 db 9f
    81 66 85 c0 74 14 48 8d 75 f0 0f b7 c0 bf 04 00
    RIP  [<ffffffff812a588f>] notify_remote_via_irq+0x13/0x34
     RSP <ffff8800e7bf7bd0>
    CR2: 0000000b819fdb98
    ---[ end trace 098b4b74827595d0 ]---
    
    The root cause of the panic is the race between the resume and reconnect to 
the backend.
    
    Clearing the 'update_wanted' flag of xenfb before disconnecting from the
    backend fixes this issue.
    
    Signed-off-by: Joe Jin <joe.jin@xxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Tested-by: Gurudas Pai <gurudas.pai@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

commit c1f5db1a53a7286f6c818f71016ae6aced814d27
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date:   Fri Dec 3 09:54:03 2010 +0000

    xen: disable ACPI NUMA for PV guests
    
    Xen does not currently expose PV-NUMA information to PV
    guests. Therefore disable NUMA for the time being to prevent the
    kernel picking up on an host-level NUMA information which it might
    come across in the firmware.
    
    [ Added comment - Jeremy ]
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

commit f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a
Merge: 7d44b0440147d83a65270205b22e7d365de28948 
b9d41052794385f9d47ebb7acf4a772f3ad02398
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 07:46:26 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
      dlm: sanitize work_start() in lowcomms.c
      dlm: reduce cond_resched during send
      dlm: use TCP_NODELAY
      dlm: Use cmwq for send and receive workqueues
      dlm: Handle application limited situations properly.

commit 7d44b0440147d83a65270205b22e7d365de28948
Merge: 0dc1488527a3c01383a50e5df7187219567586a3 
1baa26b2be92fe9917e2f7ef46d423b5dfa4da71
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 10 07:43:54 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      fuse: fix ioctl ABI
      fuse: allow batching of FORGET requests
      fuse: separate queue for FORGET requests
      fuse: ioctl cleanup
    
    Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done
    the RCU-freeing of the inode in fuse_destroy_inode().

commit 0dc1488527a3c01383a50e5df7187219567586a3
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:40:33 2011 -0800

    pipe_fs_i.h: fix kernel-doc warning
    
    Fix kernel-doc notation warnings in pipe_fs_i.h:
    
      Warning(include/linux/pipe_fs_i.h:58): No description found for parameter 
'buffers'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 175881db8916a5f5cdf920d32214caef588870fd
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:38:02 2011 -0800

    hrtimer.h: fix kernel-doc warning
    
    Fix new kernel-doc notation warning in hrtimer.h:
    
      Warning(include/linux/hrtimer.h:150): Excess struct/union/enum/typedef 
member 'first' description in 'hrtimer_clock_base'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 2a8c0c68487a68441e701f493f43fd547d87c8df
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:37:20 2011 -0800

    fs: fix dcache.h kernel-doc notation
    
    Fix new kernel-doc notation warning in dcache.h:
    
      Warning(include/linux/dcache.h:316): Excess function parameter 'Returns' 
description in '__d_rcu_to_refcount'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: Nick Piggin <npiggin@xxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 39191628ed169510db2f3f472e1ec14e08f9690f
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Jan 8 19:36:21 2011 -0800

    fs: fix namei.c kernel-doc notation
    
    Fix new kernel-doc notation warnings in fs/namei.c and spell
    ECHILD correctly.
    
      Warning(fs/namei.c:218): No description found for parameter 'flags'
      Warning(fs/namei.c:425): Excess function parameter 'Returns' description 
in 'nameidata_drop_rcu'
      Warning(fs/namei.c:478): Excess function parameter 'Returns' description 
in 'nameidata_dentry_drop_rcu'
      Warning(fs/namei.c:540): Excess function parameter 'Returns' description 
in 'nameidata_drop_rcu_last'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: Nick Piggin <npiggin@xxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 365e215ce1f154e288ff0f7c9acbdf5421f57949
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Mon Dec 27 00:07:30 2010 +0900

    nilfs2: unfold nilfs_dat_inode function
    
    nilfs_dat_inode function was a wrapper to switch between normal dat
    inode and gcdat, a clone of the dat inode for garbage collection.
    
    This function got obsolete when the gcdat inode was removed, and now
    we can access the dat inode directly from a nilfs object.  So, we will
    unfold the wrapper and remove it.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit bcbc8c648d6cc88f771435d8031c1a13e00945ed
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Mon Dec 27 00:05:49 2010 +0900

    nilfs2: do not pass sbi to functions which can get it from inode
    
    This removes argument for passing nilfs_sb_info structure from
    nilfs_set_file_dirty and nilfs_load_inode_block functions.  We can get
    a pointer to the structure from inodes.
    
    [Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>: fix conflict with commit
     b74c79e99389cd79b31fcc08f82c24e492e63c7e]
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit 06df0f999247a3153c3ec284c7ada36ef785eb97
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Mon Dec 27 00:04:06 2010 +0900

    nilfs2: get rid of nilfs_mount_options structure
    
    Only mount_opt member is used in the nilfs_mount_options structure,
    and we can simplify it.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit a7a8447edef2cfa9b28cc3892993d9fafb362671
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Mon Dec 27 00:03:02 2010 +0900

    nilfs2: simplify nilfs_mdt_freeze_buffer
    
    nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer()
    always returns a valid buffer head, so its validity check can be
    removed.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit 888da23c2f70ca2e9897b725322a6456285ee9c4
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Mon Dec 27 00:01:28 2010 +0900

    nilfs2: get rid of loaded flag from nilfs object
    
    NILFS_LOADED flag of the nilfs object is not used now, so this will
    remove it.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit ae53a0a2ce2a89f1aa824a5fc6d2099907cfb409
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Sun Dec 26 23:30:02 2010 +0900

    nilfs2: fix a checkpatch error in page.c
    
    Will correct the following checkpatch error:
    
     ERROR: trailing whitespace
     #494: FILE: page.c:494:
     + $
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit 622daaff0a8975fb5c5b95f24f3234550ba32e92
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Sun Dec 26 16:38:43 2010 +0900

    nilfs2: fiemap support
    
    This adds fiemap to nilfs.  Two new functions, nilfs_fiemap and
    nilfs_find_uncommitted_extent are added.
    
    nilfs_fiemap() implements the fiemap inode operation, and
    nilfs_find_uncommitted_extent() helps to get a range of data blocks
    whose physical location has not been determined.
    
    nilfs_fiemap() collects extent information by looping through
    nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit 27e6c7a3ce29ae5fa5bec4ed5917f8508bfac120
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Sun Dec 26 16:28:28 2010 +0900

    nilfs2: mark buffer heads as delayed until the data is written to disk
    
    Nilfs does not allocate new blocks on disk until they are actually
    written to.  To implement fiemap, we need to deal with such blocks.
    
    To allow successive fiemap patch to distinguish mapped but unallocated
    regions, this marks buffer heads of those new blocks as delayed and
    clears the flag after the blocks are written to disk.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit e828949e5b42bfd234ee537cdb7c5e3a577958a3
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Fri Nov 19 15:26:20 2010 +0900

    nilfs2: call nilfs_error inside bmap routines
    
    Some functions using nilfs bmap routines can wrongly return invalid
    argument error (i.e. -EINVAL) that bmap returns as an internal code
    for btree corruption.
    
    This fixes the issue by catching and converting the internal EINVAL to
    EIO and calling nilfs_error function inside bmap routines.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit b004a5eb0babec7ef91558f73315ef49e5a1f285
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Tue Nov 9 16:35:21 2010 -0800

    fs/nilfs2/super.c: Use printf extension %pV
    
    Using %pV reduces the number of printk calls and
    eliminates any possible message interleaving from
    other printk calls.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit af1761f268ff2a58f2ea22e9b9de6359f7b2048e
Author: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
Date:   Tue Nov 23 23:37:23 2010 +0900

    MAINTAINERS: add nilfs2 git tree entry
    
    NILFS2 filesystem section of the MAINTAINERS file lacks an entry of
    scm tree.  This adds it.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>

commit 20054bd65703f7504a9daceabc2a060828fde36c
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:27 2011 -0500

    cifs: use CreationTime like an i_generation field
    
    Reduce false inode collisions by using the CreationTime like an
    i_generation field. This way, even if the server ends up reusing
    a uniqueid after a delete/create cycle, we can avoid matching
    the inode incorrectly.
    
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit aeda4ac3efc29e4d55989abd0a73530453aa69ba
Merge: d2e7ad19229f982fc1eb731827d82ceac90abfb3 
350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8
Author: James Morris <jmorris@xxxxxxxxx>
Date:   Mon Jan 10 10:40:42 2011 +1100

    Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into 
next

commit d44a9fe2c8af3fee8edb203e9b11e507851c50fa
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:29 2011 -0500

    cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
    
    We call CIFSSMBUnixSetPathInfo in these functions, but we have a
    filehandle since an open was just done. Switch these functions to
    use CIFSSMBUnixSetFileInfo instead.
    
    In practice, these codepaths are only used if posix opens are broken.
    
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit ca40b714b8f9f20118b7071cb7cf49954166dbdf
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:29 2011 -0500

    cifs: show "acl" in DebugData Features when it's compiled in
    
    ...and while we're at it, reduce the number of calls into the seq_*
    functions by prepending spaces to strings.
    
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit b4d6fcf13f417464c13c6fde46e87c495ba6b6ee
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:28 2011 -0500

    cifs: move "ntlmssp" and "local_leases" options out of experimental code
    
    I see no real need to leave these sorts of options under an
    EXPERIMENTAL ifdef. Since you need a mount option to turn this code
    on, that only blows out the testing matrix.
    
    local_leases has been under the EXPERIMENTAL tag for some time, but
    it's only the mount option that's under this label. Move it out
    from under this tag.
    
    The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount
    option to turn it on, and in the future any distro will reasonably
    want this enabled. Go ahead and move it out from under the
    EXPERIMENTAL tag.
    
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Acked-by: Suresh Jayaraman <sjayaraman@xxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit 1397f2ee4be65542fdc3460c7e8b6317779ea680
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:28 2011 -0500

    cifs: replace some hardcoded values with preprocessor constants
    
    A number of places that deal with RFC1001/1002 negotiations have bare
    "15" or "16" values. Replace them with RFC_1001_NAME_LEN and
    RFC_1001_NAME_LEN_WITH_NULL.
    
    The patch also cleans up some checkpatch warnings for code surrounding
    the changes. This should apply cleanly on top of the patch to remove
    Local_System_Name.
    
    Reported-and-Reviwed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit a0f8b4fb4cab4bc32caaf34fc0a0c9d5dd369186
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date:   Fri Jan 7 11:30:28 2011 -0500

    cifs: remove unnecessary locking around sequence_number
    
    The server->sequence_number is already protected by the srv_mutex. The
    GlobalMid_lock is unneeded here.
    
    Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
    Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit 197a1eeb7f89c1d2ba93713398e9655899aa973e
Author: Steve French <sfrench@xxxxxxxxxx>
Date:   Sun Jan 9 23:26:56 2011 +0000

    [CIFS] Fix minor merge conflict in fs/cifs/dir.c
    
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3
Merge: 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 
0c21e3aaf6ae85bee804a325aa29c325209180fd
Author: Steve French <sfrench@xxxxxxxxxx>
Date:   Sun Jan 9 23:18:16 2011 +0000

    Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
    
    Conflicts:
        fs/cifs/dir.c

commit d2e7ad19229f982fc1eb731827d82ceac90abfb3
Merge: d03a5d888fb688c832d470b749acc5ed38e0bc1d 
0c21e3aaf6ae85bee804a325aa29c325209180fd
Author: James Morris <jmorris@xxxxxxxxx>
Date:   Mon Jan 10 09:46:24 2011 +1100

    Merge branch 'master' into next
    
    Conflicts:
        security/smack/smack_lsm.c
    
    Verified and added fix by Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Ok'd by Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
    
    Signed-off-by: James Morris <jmorris@xxxxxxxxx>

commit 6099469805c24af14250e182bb9ca082b8a6b716
Author: Roland Stigge <stigge@xxxxxxxxx>
Date:   Sun Jan 9 09:31:39 2011 -0500

    hwmon: Support for Dallas Semiconductor DS620
    
    Driver for Dallas Semiconductor DS620 temperature sensor and thermostat
    
    Signed-off-by: Roland Stigge <stigge@xxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3
Merge: 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 
8165984acf825917437debae519209073c32a5a7
Author: Pekka Enberg <penberg@xxxxxxxxxx>
Date:   Sun Jan 9 11:05:53 2011 +0200

    Merge branch 'slab/next' into for-linus

commit a081748735c5feb96b1365e78a5ff0fb6ca7e3a4
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Sat Jan 8 21:42:42 2011 -0700

    of/flattree: forward declare struct device_node in of_fdt.h
    
    This patch forward declares struct device_node to fix a compile error
    when of_fdt.h is included, but of.h is not.  Alternately, including
    linux/of.h could have been added to of_fdt.h, but that pulls in a lot
    of unnecessary declarations when only working with the flattened
    form.
    
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 430400b86304ea729ba10f2966a8af67da60a37f
Author: Urs Fleisch <urs.fleisch@xxxxxxxxx>
Date:   Fri Jan 7 07:15:39 2011 +0000

    hwmon: driver for Sensirion SHT21 humidity and temperature sensor
    
    Signed-off-by: Urs Fleisch <urs.fleisch@xxxxxxxxxxxxx>
    Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit c6c2c1636e30bcd26c6b0d208324055a03c5ab9c
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date:   Thu Jan 6 07:52:03 2011 -0800

    hwmon: Add humidity attribute to sysfs ABI
    
    The humidity attribute is already supported by the sht15 driver, and another
    driver supporting it is about to be added. Make it official.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
    Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
    Acked-by: Jean Delvare <khali@xxxxxxxxxxxx>

commit 581693b51e44bb2c0cca16ab0c8d3cb535fd2ac8
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date:   Mon Jun 28 13:22:27 2010 -0700

    hwmon: sysfs ABI updates
    
    Add attributes supported by various PMBus devices to hwmon sysfs ABI.
    
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit ae9e0ce73e9fc55a620e0b3bd4a154330a7e64cc
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date:   Mon Dec 6 11:48:35 2010 -0500

    hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 0f1deb4b820cfacf22492abd7b17e891dafc51ae
Author: Davide Rizzo <elpa.rizzo@xxxxxxxxx>
Date:   Thu Nov 18 07:23:00 2010 -0800

    hwmon: (lm95241) Rewrite to avoid using macros
    
    Signed-off-by: Davide Rizzo <elpa.rizzo@xxxxxxxxx>
    [guenter.roeck@xxxxxxxxxxxx: Formatting changes]
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 2bfe814826b7266a489895f731a777f8cbe37963
Author: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
Date:   Wed Nov 10 10:42:21 2010 -0800

    hwmon: (applesmc) Fix checkpatch errors and fix value range checks
    
    This patch fixes all checkpatch errors and most of the checkpatch warnings.
    It also fixes the range check in applesmc_store_fan_speed().
    
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>
    Acked-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>

commit 41e71f97174ba08fcca7f31bf448de92abc8862e
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:11 2010 +0000

    hwmon: (applesmc) Update copyright information
    
    With the preceding patches, git blame assigns about half of
    the file to the present author. Add a line to the copyright
    to reflect this.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 0b8ad5a57b75322e4b671ef420b5fe90e5154912
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:10 2010 +0000

    hwmon: (applesmc) Silence driver
    
    Make the driver report a single line on success.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 0b0b5dff8967a4468f05174d0d74e1ed6e369776
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:09 2010 +0000

    hwmon: (applesmc) Simplify feature sysfs handling
    
    Given the dynamic node construction method, the setup of the
    accelerometer, light sensor and keyboard backlight sysfs nodes
    can be simplified. This patch does not contain any logic changes.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 3eba2bf7c5fb7863412554cd73646cb80ac293ff
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:08 2010 +0000

    hwmon: (applesmc) Dynamic creation of fan files
    
    With the dynamic temperature group in place, the setup of fans
    can be simplified. This patch sets up the fans dynamically, removing
    a hundred lines of code.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 40ef06f1120bcc0a2ad483b5cd42f58c4df78a5b
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Wed Nov 10 10:58:05 2010 +0000

    hwmon: (applesmc) Extract all features generically
    
    With temperature keys being determined automatically, the dmi match
    data is only used to assign features that can easily be detected from
    the smc. This patch removes the dmi match data altogether, and reduces
    the match table to the main machine models.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit dcdea2614ab9b7864a3ae620419d04e0cc4a65cc
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:06 2010 +0000

    hwmon: (applesmc) Handle new temperature format
    
    The recent Macbooks have temperature registers of a new type.
    This patch adds the logic to handle them.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 9792dadfce22ae1518c88577ac743a3077a85084
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Wed Nov 10 10:58:04 2010 +0000

    hwmon: (applesmc) Dynamic creation of temperature files
    
    The current driver creates temperature files based on a list
    of temperature keys given per device. Apart from slow adaption
    to new machine models, the number of sensors also depends on
    the number of processors. This patch looks up the temperature
    keys dynamically, thereby supporting all models.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 5874583d5662de5550b0ed1c54a9dea70bcdcba4
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Wed Nov 10 10:58:03 2010 +0000

    hwmon: (applesmc) Introduce a register lookup table
    
    One main problem with the current driver is the inability to quickly
    search for supported keys, resulting in detailed feature maps per
    machine model which are cumbersome to maintain.
    
    This patch adds a register lookup table, which enables binary search
    for supported keys. The lookup also reduces the io frequency, so the
    original mutex is replaced by locks around the actual io.
    
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    [guenter.roeck@xxxxxxxxxxxx: Added value range check to 
key_at_index_store()]
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 1ee7c71bd1aa9758f14e1be92310215a5bd0abe7
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:03 2010 +0000

    hwmon: (applesmc) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 2344cd0c2e9ea8f3037be11fb997ddbeda0237ca
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Tue Nov 9 15:15:02 2010 +0000

    hwmon: (applesmc) Relax the severity of device init failure
    
    The device init is used to reset the accelerometer. Failure to reset
    is not severe enough to stop loading the module or to resume from
    hibernation.  This patch relaxes failure to a warning and drops
    output in case of success.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 132af03233b493101a53010383b5abb5b9ff1e51
Author: Edgar Hucek <gimli@xxxxxxxxxxxxxx>
Date:   Tue Nov 9 15:15:01 2010 +0000

    hwmon: (applesmc) Add MacBookAir3,1(3,2) support
    
    This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
    applesmc driver.
    
    [rydberg@xxxxxxxxxxx: minor cleanup]
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Edgar Hucek <gimli@xxxxxxxxxxxxxx>
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 18de030f1dbaef0c13cf393899a298d978aa200f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:55 2010 +0000

    hwmon: (w83627hf) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit abdc6fd189405a83ebd20aa9facfbdf3c179d48a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:54 2010 +0000

    hwmon: (w83627ehf) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 9d72be0da16da10e27f6a8c01f877db6c513413d
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:53 2010 +0000

    hwmon: (vt8231) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 5ed9ba6b87545d21b48e50a028bfb79f9812f89f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:52 2010 +0000

    hwmon: (vt1211) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 774f7827e13cfae720306ca44b83b93ab2a6b9be
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:51 2010 +0000

    hwmon: (via686a) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit edb8d53c684da4062ac8c461727ddc1839336aa5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:50 2010 +0000

    hwmon: (via-cputemp) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 512504e9f5489dbe85c80fd2c1b44ab5a8e0d5fa
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:49 2010 +0000

    hwmon: (smsc47m1) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit bf1a85eff87eeb0651b1c5b348d51206ec7c0ef5
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:48 2010 +0000

    hwmon: (smsc47b397) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 4b2515dbb94341db01db3208f9f40658c5e2a251
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:47 2010 +0000

    hwmon: (sis5595) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 14a613cc23869d0ca69154bbc5816004fe201b17
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:46 2010 +0000

    hwmon: (pkgtemp) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 2caec1343e0cfe59bacf3d4f67d69ab6283cc75b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:45 2010 +0000

    hwmon: (pcf8591) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 5713017ec5e1a437ae4d0d196bce46d572eb7e1a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:41 2010 +0000

    hwmon: (lm70) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 63366d37ad5dbb4f208b517c88ea4bd41738dbf7
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:40 2010 +0000

    hwmon: (lis3lv02d) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 55d705cce829c37999f26a8d4f1dd701013e7920
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:38 2010 +0000

    hwmon: (ibmaem) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit c95df1ae69b85d5f306d86164e245aae614b852a
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:37 2010 +0000

    hwmon: (core) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 1f923c7a6726b224b6b1b059da5a7f8e3dff1196
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:36 2010 +0000

    hwmon: (hwmon-vid) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 53ab0e6888925ae3ebe931c060120b0f11c1923c
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:35 2010 +0000

    hwmon: (hp_accel) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 22d3b41281b4c1a55086fa4dff7abb4f0c36403e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:34 2010 +0000

    hwmon: (f71882fg) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit e54c5ad61f4e2c4fdfbdb8dff31fc604073d3550
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:33 2010 +0000

    hwmon: (f71805f) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:32 2010 +0000

    hwmon: (dme1737) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit f8bb8925682f355dc20f721bda7021ef13e5869f
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:31 2010 +0000

    hwmon: (coretemp) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit ac561494d48b92a41424cc87e2a02b545424643c
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:30 2010 +0000

    hwmon: (asus_atk0110) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 4d630e2ba59a231c8e5031cc55e16737aa59af97
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:29 2010 +0000

    hwmon: (asb1000) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 2e991201e4ebffb1fb32873d72e2ee4b499269c3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:27 2010 +0000

    hwmon: (adt7470) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit fe826749aec090c6f9ab48502bb9a7777572b85b
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:26 2010 +0000

    hwmon: (abituguru3) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    Added a few static strings to standardize logging messages.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 28ebfa13f97265e415fbe19795500a6d922a6c86
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Wed Oct 20 06:51:25 2010 +0000

    hwmon: (abituguru) Use pr_fmt and pr_<level>
    
    Added #define pr_fmt KBUILD_MODNAME ": " fmt
    Converted printks to pr_<level>
    Coalesced any long formats
    Removed prefixes from formats
    Added a few static strings to standardize logging messages.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 2ad2c320a107aceeba984f97ab2a60064101f5d5
Author: Nick Bowler <nbowler@xxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 21:32:02 2011 -0500

    pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies.
    
    CONFIG_HAVE_PATA_PLATFORM, by virtue of where its defined, has a
    dependency on CONFG_ATA and CONFIG_ATA_SFF.  This causes Kconfig
    warnings when it is selected by various architectures, such as
    
      warning: (ARCH_VEXPRESS && <choice> || ARCH_RPC && <choice> || 
MACH_VPAC270 && ARCH_PXA || MACH_REALVIEW_PB11MP && ARCH_REALVIEW || 
MACH_REALVIEW_PBA8 && ARCH_REALVIEW || MACH_REALVIEW_PBX && ARCH_REALVIEW || 
MACH_BAST_IDE && ARCH_S3C2410 || MACH_ANUBIS && ARCH_S3C2410) selects 
HAVE_PATA_PLATFORM which has unmet direct dependencies (ATA && ATA_SFF)
    
    Since this option is only used to control visibility of the
    CONFIG_PATA_PLATFORM option and isn't itself visible in the menu,
    it is straightforward to simply remove these dependencies rather
    than adjust all the architectures.
    
    Signed-off-by: Nick Bowler <nbowler@xxxxxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit fc2698d5ec7e96ba2c94a942329cfa4c5d6085f7
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Wed Jan 5 21:59:49 2011 +0300

    pata_hpt37x: actually limit HPT370 to UltraDMA/66
    
    The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock 
is
    less than 50 MHz but due to cut&paste type mistake this code has no 
effect...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit b197f13b53681c606e59d7d9a8a1d2d54fd363fe
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Tue Dec 28 23:11:36 2010 +0300

    pata_hpt3x2n: coding style cleanup
    
    Fix 8 errors and 3 warnings given by checkpatch.pl:
    
    - *switch* and *case* not on the same indentation level;
    
    - no space between *for*/*switch*/*while* and open parenthesis;
    
    - space between an unary operator and its operand;
    
    - spaces before tabs;
    
    - lines over 80 characters.
    
    In addition to these changes, also do the following:
    
    - add new line after variable definitions;
    
    - fix the style of some multi-line comments.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 49bfbd38bfc997e9081beabd758b2bd655d26a9c
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Tue Dec 28 23:09:27 2010 +0300

    pata_hpt37x: coding style cleanup
    
    Fix 12 errors and 15 warnings given by checkpatch.pl:
    
    - *switch* and *case* not on the same indentation level;
    
    - no space between *for*/*switch*/*while* and open parenthesis;
    
    - space between an unary operator and its operand;
    
    - drive blacklist arrays not being *const*;
    
    - spaces before tabs;
    
    - lines over 80 characters.
    
    In addition to these changes, also do the following:
    
    - add new line after variable definitions;
    
    - fix the style of some multi-line comments.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 28cd4b6b4850d7588f1033c3808314b6bc2150d5
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Tue Dec 28 23:06:38 2010 +0300

    pata_hpt366: coding style cleanup
    
    Fix 2 errors and 11 warnings given by checkpatch.pl:
    
    - *switch* and *case* not on the same indentation level;
    
    - no space between *switch* and open parenthesis;
    
    - drive blacklist arrays not being *const*;
    
    - spaces before tabs;
    
    - lines over 80 characters.
    
    In addition to these changes, also add new line after variable definition in
    hpt36x_init_chipset()...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit dfc7e3e37d4a22ed5fd3f6e8c9842cb1246fee4f
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Tue Dec 28 22:54:54 2010 +0300

    pata_hpt3x2n: calculate average f_CNT
    
    Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff
    HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading
    the full 16-bit register, unlike what that driver does), so that this driver
    would work correctly on e.g. non-x86 machine with 66 MHz PCI.
    
    I'm not sure why Alan has only done this in one driver and not the other...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 0ca646db68d1bd7184dfc41362d0dd9d56c0e57e
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Tue Dec 28 21:46:40 2010 +0300

    pata_hpt3x2n: clarify about HPT371N support
    
    Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N
    support and other bits) forgot to update the driver's Kconfig entry, heading
    comment, and module description (that also wrongly claims support of HPT302)
    which may confuse users...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 8e834c2e6d51e053c6bd23fec1d95529f618f760
Author: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Date:   Sat Dec 25 22:44:01 2010 +0300

    pata_hpt{37x|3x2n}: SATA mode filtering
    
    The Marvell bridge chips used on HighPoint SATA cards do not seem to support
    the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes;  these cards are
    based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so
    the Linux drivers need to have a mode_filter() method for these chips...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 0c21e3aaf6ae85bee804a325aa29c325209180fd
Merge: 021db8e2bde53024a163fb4417a185de46fe77aa 
b2837fcf4994e699a4def002e26f274d95b387c1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 17:16:27 2011 -0800

    Merge branch 'for-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
      hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
      hfsplus: spaces/indentation clean-up
      hfsplus: C99 comments clean-up
      hfsplus: over 80 character lines clean-up
      hfsplus: fix an artifact in ioctl flag checking
      hfsplus: flush disk caches in sync and fsync
      hfsplus: optimize fsync
      hfsplus: split up inode flags
      hfsplus: write up fsync for directories
      hfsplus: simplify fsync
      hfsplus: avoid useless work in hfsplus_sync_fs
      hfsplus: make sure sync writes out all metadata
      hfsplus: use raw bio access for partition tables
      hfsplus: use raw bio access for the volume headers
      hfsplus: always use hfsplus_sync_fs to write the volume header
      hfsplus: silence a few debug printks
      hfsplus: fix option parsing during remount
    
    Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}

commit 021db8e2bde53024a163fb4417a185de46fe77aa
Merge: 72eb6a791459c87a0340318840bb3bd9252b627b 
07fe0351702b6f0c9749e80cdbcb758686b0fe9b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 17:08:46 2011 -0800

    Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
    
    * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
      spi/omap: Fix DMA API usage in OMAP MCSPI driver
      spi/imx: correct the test on platform_get_irq() return value
      spi/topcliff: Typo fix threhold to threshold
      spi/dw_spi Typo change diable to disable.
      spi/fsl_espi: change the read behaviour of the SPIRF
      spi/mpc52xx-psc-spi: move probe/remove to proper sections
      spi/dw_spi: add DMA support
      spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
      spi/dw_spi: Fix too short timeout in spi polling loop
      spi/pl022: convert running variable
      spi/pl022: convert busy flag to a bool
      spi/pl022: pass the returned sglen to the DMA engine
      spi/pl022: map the buffers on the DMA engine
      spi/topcliff_pch: Fix data transfer issue
      spi/imx: remove autodetection
      spi/pxa2xx: pass of_node to spi device and set a parent device
      spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX 
bytes.
      spi/pxa2xx: Add chipselect support for Sodaville
      spi/pxa2xx: Consider CE4100's FIFO depth
      spi/pxa2xx: Add CE4100 support
      ...

commit 72eb6a791459c87a0340318840bb3bd9252b627b
Merge: 23d69b09b78c4876e134f104a3814c30747c53f1 
55ee4ef30241a62b700f79517e6d5ef2ddbefa67
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 17:02:58 2011 -0800

    Merge branch 'for-2.6.38' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
    
    * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: 
(30 commits)
      gameport: use this_cpu_read instead of lookup
      x86: udelay: Use this_cpu_read to avoid address calculation
      x86: Use this_cpu_inc_return for nmi counter
      x86: Replace uses of current_cpu_data with this_cpu ops
      x86: Use this_cpu_ops to optimize code
      vmstat: User per cpu atomics to avoid interrupt disable / enable
      irq_work: Use per cpu atomics instead of regular atomics
      cpuops: Use cmpxchg for xchg to avoid lock semantics
      x86: this_cpu_cmpxchg and this_cpu_xchg operations
      percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
      percpu,x86: relocate this_cpu_add_return() and friends
      connector: Use this_cpu operations
      xen: Use this_cpu_inc_return
      taskstats: Use this_cpu_ops
      random: Use this_cpu_inc_return
      fs: Use this_cpu_inc_return in buffer.c
      highmem: Use this_cpu_xx_return() operations
      vmstat: Use this_cpu_inc_return for vm statistics
      x86: Support for this_cpu_add, sub, dec, inc_return
      percpu: Generic support for this_cpu_add, sub, dec, inc_return
      ...
    
    Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, 
process.c}
    as per Tejun.

commit 23d69b09b78c4876e134f104a3814c30747c53f1
Merge: e744070fd4ff9d3114277e52d77afa21579adce2 
569ff2de2e1c8ac67c8df3a7367d46d0d9460a35
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 16:58:04 2011 -0800

    Merge branch 'for-2.6.38' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
    
    * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 
commits)
      usb: don't use flush_scheduled_work()
      speedtch: don't abuse struct delayed_work
      media/video: don't use flush_scheduled_work()
      media/video: explicitly flush request_module work
      ioc4: use static work_struct for ioc4_load_modules()
      init: don't call flush_scheduled_work() from do_initcalls()
      s390: don't use flush_scheduled_work()
      rtc: don't use flush_scheduled_work()
      mmc: update workqueue usages
      mfd: update workqueue usages
      dvb: don't use flush_scheduled_work()
      leds-wm8350: don't use flush_scheduled_work()
      mISDN: don't use flush_scheduled_work()
      macintosh/ams: don't use flush_scheduled_work()
      vmwgfx: don't use flush_scheduled_work()
      tpm: don't use flush_scheduled_work()
      sonypi: don't use flush_scheduled_work()
      hvsi: don't use flush_scheduled_work()
      xen: don't use flush_scheduled_work()
      gdrom: don't use flush_scheduled_work()
      ...
    
    Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
    as per Tejun.

commit 4ead36407b41eae942c8c9f70ef963cd369c90e2
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 10 19:43:34 2010 +0100

    HID: roccat: Update sysfs attribute doc
    
    Updated sysfs attribute documentation to reflect recent changes
    in driver design. The device specific attributes moved from the
    driver to the respective roccat char device.
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit 4d043101897768dfde30a6f2674fc7cec403d6b0
Author: Jiri Kosina <jkosina@xxxxxxx>
Date:   Thu Dec 9 14:29:34 2010 +0100

    HID: roccat: don't use #pragma pack
    
    Replace #pragma pack ocurences with __atribute__((__packed__));
    
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit 47dbdbffe15b9582a41727766d43f1d4208e977e
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Nov 26 19:57:42 2010 +0000

    HID: roccat: Add support for Roccat Kone[+] v2
    
    This patch adds support for Roccat Kone[+] gaming mouse. Kone[+] is an 
enhanced version
    of the old Kone with more memory for macros, a better sensor and more 
functionality.
    This driver is conceptual similar to the existing Kone and Pyra drivers.
    Userland tools can soon be found at http://sourceforge.net/projects/roccat
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit 14a057f80f0c4d45a9e68009f8bcb6b246e87ca0
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Nov 26 19:57:38 2010 +0000

    HID: roccat: reduce number of functions in kone and pyra drivers
    
    The profile number is now passed via bin_attribute->private instead
    of function parameter to reduce number of functions.
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit bd3a2b96631dd86b06dca96aef00790084a11e15
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Nov 26 19:57:36 2010 +0000

    HID: roccat: declare meaning of pack pragma usage in driver headers
    
    Using pack pragma to prevent padding bytes in binary data structures
    used for hardware communication. Explanation of these pragmas was requested.
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit 5012aada506cb8b570e46579077c0ec5b82ebd5d
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Nov 26 19:57:33 2010 +0000

    HID: roccat: use class for char device for sysfs attribute creation
    
    Adding sysfs attributes to an already created device raises no userland
    notification. Now the device drivers associate the devices attributes
    with a class and use this for roccat event char device creation.
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit c97415a72521071c235e0879f9a600014afd87b1
Author: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Nov 26 19:57:29 2010 +0000

    sysfs: Introducing binary attributes for struct class
    
    Added dev_bin_attrs to struct class similar to existing dev_attrs.
    
    Signed-off-by: Stefan Achatz <erazor_de@xxxxxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit a7153258b70ccbe3922fcee9ca4271d4f4c2bc55
Merge: ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 
0fbf8ed976af5bb43cf9cf2492161eb9688fee0c
Author: Jiri Kosina <jkosina@xxxxxxx>
Date:   Sat Jan 8 01:08:19 2011 +0100

    Merge branches 'upstream' and 'upstream-fixes' into for-linus

commit e14411da420bad7bdaae65cccd8787674e6c565e
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date:   Tue Nov 30 13:06:36 2010 -0800

    msm: add SMP support for msm
    
    Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
    Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>

commit 9f1890a5de2a5fcf4fd9ffa3115047eed834349c
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date:   Thu Dec 2 12:11:27 2010 -0800

    msm: hotplug: support cpu hotplug on msm
    
    Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
    Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>

commit 94790ec25fdd51dc4126cc176f2e104f80f87fcb
Author: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
Date:   Thu Dec 2 12:05:12 2010 -0800

    msm: timer: SMP timer support for msm
    
    The msm provides timer hardware that is private to each core. Each
    timer has separate counter and match registers, so we create separate
    clock_event_devices for each core. For the global clocksource, use
    cpu 0's counter.
    
    Signed-off-by: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
    Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>

commit 7b181446c68768e2f3231a0885095ee41261dcde
Author: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
Date:   Thu Oct 14 19:19:21 2010 -0700

    msm: scm-boot: Support for setting cold/warm boot addresses
    
    Add support for setting the cold boot address of core 1 and
    the warm boot addresses of cores 0 and 1 using a secure
    domain call.
    
    Signed-off-by: Stepan Moskovchenko <stepanm@xxxxxxxxxxxxxx>
    Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>

commit 2a1eb58a86514037c8b59eb13a14b0e2a9cc0fb3
Author: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
Date:   Fri Aug 27 10:01:23 2010 -0700

    msm: Secure Channel Manager (SCM) support
    
    SCM is the protocol used to communicate between the secure and
    non-secure code executing on the applications processor. The
    non-secure side uses a physically contiguous buffer to pass
    information to the secure side; where the buffer conforms to a
    format that is agreed upon by both sides. The use of a buffer
    allows multiple pending requests to be in flight on the secure
    side. It also benefits use cases where the command or response
    buffer contains large chunks of data.
    
    Reviewed-by: Saravana Kannan <skannan@xxxxxxxxxxxxxx>
    Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
    Signed-off-by: David Brown <davidb@xxxxxxxxxxxxxx>

commit e744070fd4ff9d3114277e52d77afa21579adce2
Merge: d004e4d3322340b6433caaef4a47ab8c933afb70 
c9b5f501ef1580faa30c40c644b7691870462201
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:55:48 2011 -0800

    Merge branch 'sched-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Constify function scope static struct sched_param usage
      sched: Fix strncmp operation
      sched: Move sched_autogroup_exit() to free_signal_struct()
      sched: Fix struct autogroup memory leak
      sched: Mark autogroup_init() __init
      sched: Consolidate the name of root_task_group and init_task_group

commit d004e4d3322340b6433caaef4a47ab8c933afb70
Merge: 128283a47e7cc6754db3d2704004c1ed728d26db 
1c2a48cf65580a276552151eb8f78d78c55b828e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:55:31 2011 -0800

    Merge branch 'x86-apic-cleanups-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-apic-cleanups-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: apic: Cleanup and simplify setup_local_APIC()
      x86: Further simplify mp_irq info handling
      x86: Unify 3 similar ways of saving mp_irqs info
      x86, ioapic: Avoid writing io_apic id if already correct
      x86, x2apic: Don't map lapic addr for preenabled x2apic systems
      x86, sfi: Use register_lapic_address()
      x86, apic: Use register_lapic_address() in init_apic_mapping()
      x86, apic: Remove early_init_lapic_mapping()
      x86, apic: Unify identical register_lapic_address() functions

commit 128283a47e7cc6754db3d2704004c1ed728d26db
Merge: 442d1ba237c81304ccfa33887094e843183645f7 
6d5db4668796d903dc3bad2852c82073509c37d2
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:54:03 2011 -0800

    Merge branch 'mce-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
    
    * 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      EDAC, MCE: Fix NB error formatting
      EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
      EDAC, MCE: Enable MCE decoding on F15h
      EDAC, MCE: Allow F15h bank 6 MCE injection
      EDAC, MCE: Shorten error report formatting
      EDAC, MCE: Overhaul error fields extraction macros
      EDAC, MCE: Add F15h FP MCE decoder
      EDAC, MCE: Add F15 EX MCE decoder
      EDAC, MCE: Add an F15h NB MCE decoder
      EDAC, MCE: No F15h LS MCE decoder
      EDAC, MCE: Add F15h CU MCE decoder
      EDAC, MCE: Add F15h IC MCE decoder
      EDAC, MCE: Add F15h DC MCE decoder
      EDAC, MCE: Select extended error code mask

commit 442d1ba237c81304ccfa33887094e843183645f7
Merge: fb5131e1880ea1ba3ba7197cd5cc66c9c288f715 
a135cef79a2927ecff800492a26cd314e9cba996
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:53:42 2011 -0800

    Merge branch 'edac-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
    
    * 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Disable DRAM ECC injection on K8
      EDAC: Fixup scrubrate manipulation
      amd64_edac: Remove two-stage initialization
      amd64_edac: Check ECC capabilities initially
      amd64_edac: Carve out ECC-related hw settings
      amd64_edac: Remove PCI ECS enabling functions
      amd64_edac: Remove explicit Kconfig PCI dependency
      amd64_edac: Allocate driver instances dynamically
      amd64_edac: Rework printk macros
      amd64_edac: Rename CPU PCI devices
      amd64_edac: Concentrate per-family init even more
      amd64_edac: Cleanup the CPU PCI device reservation
      amd64_edac: Simplify CPU family detection
      amd64_edac: Add per-family init function
      amd64_edac: Use cached extended CPU model
      amd64_edac: Remove F11h support

commit fb5131e1880ea1ba3ba7197cd5cc66c9c288f715
Merge: d074b104cefcb6e8ded55a53e62fed59a246f55d 
8e1023016cf17152972b98bce6c144834a4916d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:50:50 2011 -0800

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
    
    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)
      [S390] prevent unneccesary loops_per_jiffy recalculation
      [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
      [S390] smp: remove cpu hotplug messages
      [S390] mutex: enable spinning mutex on s390
      [S390] mutex: Introduce arch_mutex_cpu_relax()
      [S390] cio: fix ccwgroup unregistration race condition
      [S390] perf: add DWARF register lookup for s390
      [S390] cleanup ftrace backend functions
      [S390] ptrace cleanup
      [S390] smp/idle: call init_idle() before starting a new cpu
      [S390] smp: delay idle task creation
      [S390] dasd: Correct retry counter for terminated I/O.
      [S390] dasd: Add support for raw ECKD access.
      [S390] dasd: Prevent deadlock during suspend/resume.
      [S390] dasd: Improve handling of stolen DASD reservation
      [S390] dasd: do path verification for paths added at runtime
      [S390] dasd: add High Performance FICON multitrack support
      [S390] cio: reduce memory consumption of itcw structures
      [S390] nmi: enable machine checks early
      [S390] qeth: buffer count imbalance
      ...

commit d074b104cefcb6e8ded55a53e62fed59a246f55d
Merge: 31b6ca0af758a88e5e769b48cc6dde037ee37b96 
c413521eb4e2d7ffd5ce432a144708d479054bd3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:50:14 2011 -0800

    Merge branch 'rmobile-latest' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'rmobile-latest' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
      ARM: mach-shmobile: update for SMP changes.
      ARM: mach-shmobile: update for GIC changes.
      ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
      dma: shdma: don't register the global die notifier multiple times
      ARM: mach-shmobile: Rely on run-time IRQ handlers
      ARM: mach-shmobile: Run-time IRQ handler for GIC
      ARM: mach-shmobile: Run-time IRQ handler for INTCA
      ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
      ARM: mach-shmobile: Use shared GIC entry macros
      ARM: mach-shmobile: mackerel: Add zboot support
      ARM: mach-shmobile: mackerel: Add HDMI sound support
      ARM: mach-shmobile: mackerel: add HDMI video support
      ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
      ARM: mach-shmobile: sh73a0: fix div4 table
      ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
      ARM: mach-shmobile: Mackerel VGA camera support
      mmc: sh_mmcif: make DMA support by the driver unconditional
      ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
      ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
      ARM: mach-shmobile: sh73a0 GPIO pullup improvement
      ...

commit 31b6ca0af758a88e5e769b48cc6dde037ee37b96
Merge: 56b85f32d530d09d6805488ad00775d4e0e3baab 
554738da71004d96e06fb75f4772dfc3b0f47810
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:45:47 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: 
(58 commits)
      Input: wacom_w8001 - support pen or touch only devices
      Input: wacom_w8001 - use __set_bit to set keybits
      Input: bu21013_ts - fix misuse of logical operation in place of bitop
      Input: i8042 - add Acer Aspire 5100 to the Dritek list
      Input: wacom - add support for digitizer in Lenovo W700
      Input: psmouse - disable the synaptics extension on OLPC machines
      Input: psmouse - fix up Synaptics comment
      Input: synaptics - ignore bogus mt packet
      Input: synaptics - add multi-finger and semi-mt support
      Input: synaptics - report clickpad property
      input: mt: Document interface updates
      Input: fix double equality sign in uevent
      Input: introduce device properties
      hid: egalax: Add support for Wetab (726b)
      Input: include MT library as source for kerneldoc
      MAINTAINERS: Update input-mt entry
      hid: egalax: Add support for Samsung NB30 netbook
      hid: egalax: Document the new devices in Kconfig
      hid: egalax: Add support for Wetab
      hid: egalax: Convert to MT slots
      ...
    
    Fixed up trivial conflict in drivers/input/keyboard/Kconfig

commit 56b85f32d530d09d6805488ad00775d4e0e3baab
Merge: 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 
568389c257fa7d74ce36c2f78bad31965fded4cf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 14:39:20 2011 -0800

    Merge branch 'tty-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
    
    * 'tty-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
      serial: apbuart: Fixup apbuart_console_init()
      TTY: Add tty ioctl to figure device node of the system console.
      tty: add 'active' sysfs attribute to tty0 and console device
      drivers: serial: apbuart: Handle OF failures gracefully
      Serial: Avoid unbalanced IRQ wake disable during resume
      tty: fix typos/errors in tty_driver.h comments
      pch_uart : fix warnings for 64bit compile
      8250: fix uninitialized FIFOs
      ip2: fix compiler warning on ip2main_pci_tbl
      specialix: fix compiler warning on specialix_pci_tbl
      rocket: fix compiler warning on rocket_pci_ids
      8250: add a UPIO_DWAPB32 for 32 bit accesses
      8250: use container_of() instead of casting
      serial: omap-serial: Add support for kernel debugger
      serial: fix pch_uart kconfig & build
      drivers: char: hvc: add arm JTAG DCC console support
      RS485 documentation: add 16C950 UART description
      serial: ifx6x60: fix memory leak
      serial: ifx6x60: free IRQ on error
      Serial: EG20T: add PCH_UART driver
      ...
    
    Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
    makes the code look fairly sane (unlike either side).

commit 4a198be7f072190a44033b7de6084b090b9885ee
Author: Albert Astals Cid <aacid@xxxxxxx>
Date:   Fri Jan 7 17:29:44 2011 -0500

    Support KHLB2 in the compal laptop driver
    
    Add the KHLB2 model identifier to the list of supported models
    
    Signed-off-by: Albert Astals Cid <aacid@xxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 59ccf2f3d55c06fd34613f1f78de0279436a7b35
Author: From: Lee, Chun-Yi <jlee@xxxxxxxxxx>
Date:   Fri Jan 7 17:25:14 2011 -0500

    acer-wmi: Enabled Acer Launch Manager mode
    
    Enabled Acer Launch Manager mode to disable the EC raw behavior for
    communication devices when WMID3 method available. And, we also add a
    ec_raw_mode kernel module option for enable The EC raw behavior mode
    when anyone what reset it back.
    When Acer Launch Manager mode enabled, EC will stop to touch any
    communication devices' RF state or power state that causes conflict
    with rfkill_input or any userland daemon to charge the rfkill rules.
    
    Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
    Acked-by: Thomas Renninger <trenn@xxxxxxx>
    Acked-by: Jiri Benc <jbenc@xxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    Signed-off-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
    Cc: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 456dc301cc3b547b2a674de3028f53fb1453e532
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date:   Fri Dec 31 09:48:20 2010 +0800

    [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq 
subsystem
    
    Latest kernel has many changes in IRQ subsystem and its interfaces, like 
adding
    "irq_eoi" for struct irq_chip, this patch will make it support both the new
    and old interface.
    
    Cc: Alek Du <alek.du@xxxxxxxxx>
    Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 213658516fd5e125eb7a97995f6cae8996f8015b
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Fri Dec 24 19:56:28 2010 +0100

    ACPI Thinkpad: We must always call va_end() after va_start() but do not do 
so in thinkpad_acpi.c::acpi_evalf()
    
    Hi,
    
    In drivers/platform/x86/thinkpad_acpi.c::acpi_evalf() we don't always call
    va_end() after va_start(). This patch corrects that.
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Acked-by: Henrique de Moraes Holschuh <hmh@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 466449cfe797b8a5d82d25d0e0e08426d8dfba19
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date:   Mon Dec 13 10:02:41 2010 +0800

    acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
    
    Initial wlan/bluetooth/wwan rfkill software block state when acer-wmi driver
    probe. Acer notebook can save the devices state and this patch can use it to
    initial the devices' rfkill state.
    
    Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
    Acked-by: Thomas Renninger <trenn@xxxxxxx>
    Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 6c3df88f19375217f0dbfc6160e8c2a635f56c53
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date:   Tue Dec 7 10:29:23 2010 +0800

    acer-wmi: Detect the WiFi/Bluetooth/3G devices available
    
    Check the Acer OEM-specific Type AA to detect the WiFi/Bluetooth/3G
    devices available or not, and set the devices capability flag.
    
    Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
    Reviewed-by: Jean Delvare <jdelvare@xxxxxxx>
    Reviewed-by: Dmitry Torokhov <dtor@xxxxxxx>
    Acked-by: Thomas Renninger <trenn@xxxxxxx>
    Acked-by: Jiri Benc <jbenc@xxxxxxx>
    Cc: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
    Cc: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit b3c9092b2fed427d45117d23ceb577ad8dc46a9a
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date:   Tue Dec 7 10:29:22 2010 +0800

    acer-wmi: Add 3G rfkill sysfs file
    
    Add 3G rfkill sysfs file for provide userland to control 3G device
    on/off by using WMI method.
    
    Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
    Acked-by: Thomas Renninger <trenn@xxxxxxx>
    Acked-by: Jiri Benc <jbenc@xxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    Signed-off-by: Carlos Corbaho <carlos@xxxxxxxxxxxxxxxxxxx>
    Cc: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 3fdca87d10f1d45b1c034da343e68beb082f9b84
Author: Lee, Chun-Yi <joeyli.kernel@xxxxxxxxx>
Date:   Tue Dec 7 10:29:20 2010 +0800

    acer-wmi: Add acer wmi hotkey events support
    
    Add acer wmi hotkey event support. Install a wmi notify handler to
    transfer wmi event key to key code, then send out keycode through acer
    wmi input device to userland.
    
    Signed-off-by: Lee, Chun-Yi <jlee@xxxxxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    Acked-by: Thomas Renninger <trenn@xxxxxxx>
    Acked-by: Jiri Benc <jbenc@xxxxxxx>
    Signed-off-by: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx>
    Cc: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit e98062ed6dc46ed3270350e1040e19d44150d1d1
Author: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date:   Wed Dec 8 11:20:26 2010 +0100

    platform/x86: Kconfig: Replace select by depends on ACPI_WMI
    
    With 'make oldnoconfig' I see these warnings in linux-next (next-20101208):
    
    drivers/platform/x86/Kconfig:422:error: recursive dependency detected!
    drivers/platform/x86/Kconfig:422:       symbol EEEPC_WMI depends on ACPI_WMI
    drivers/platform/x86/Kconfig:438:       symbol ACPI_WMI is selected by 
ACER_WMI
    drivers/platform/x86/Kconfig:18:        symbol ACER_WMI depends on 
LEDS_CLASS
    drivers/leds/Kconfig:10:        symbol LEDS_CLASS is selected by EEEPC_WMI
    
    This patch replaces all "select on ACPI_WMI" by "depends on ACPI_WMI".
    
    Quote from David Woodhouse:
    "A better policy is: "NEVER USE SELECT"."
    
    Reported-and-tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
    Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
    Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit c1f73658edc8ac6f624968b47a276361ce032ca9
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:01:12 2010 +0800

    ideapad: pass ideapad_priv as argument (part 2)
    
    Passing ideapad_priv as argument and try not to using too much global 
variable.
    This is part 2 for rfkill.
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 8693ae846cad00e6c2c40e116ec1fc50c145b559
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:01:01 2010 +0800

    ideapad: pass ideapad_priv as argument (part 1)
    
    Passing ideapad_priv as argument and try not to using too much global 
variable.
    This is part 1 for platform driver and input device.
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit a4b5a2794a27da870c2e16db390778a4683f95f8
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:00:48 2010 +0800

    ideapad: add markups, unify comments and return result when init
    
    1. Add markups on init and exit functions
    2. Unify the comments in the same style
    3. Return result when module initial
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit f63409ae91ff94e2192dafbeb00c278ba299f80e
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:00:38 2010 +0800

    ideapad: add hotkey support
    
    Hotkey enabled by this patch:
      Fn+F3: Video mode switch
      Fn+F5: software rfkill for wifi
    
    For some ideapad when push Fn+F3, hardware generates Super-P keys, those key
    will not be enabled by this patch.
    
    Thanks for Dave Hansen report the problem. If CONFIG_INPUT_SPARSEKMAP is not
    set, when building, you will have error message:
    
      ERROR: "sparse_keymap_setup" [drivers/platform/x86/ideapad-laptop.ko] 
undefined!
      ERROR: "sparse_keymap_free" [drivers/platform/x86/ideapad-laptop.ko] 
undefined!
      ERROR: "sparse_keymap_report_event" 
[drivers/platform/x86/ideapad-laptop.ko] undefined!
    
    To select INPUT_SPARSEKMAP solve this issue.
    
    Ref: http://lkml.org/lkml/2010/12/2/340
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit c9f718d0c6b4cf8033aa0f5ac892d68ddfb865aa
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:00:27 2010 +0800

    ideapad: let camera power control entry under platform driver
    
    The entry was at /sys/devices/LNXSYSTM:00/../VPC2004:00/camera_power
    move to /sys/devices/platform/ideapad/camera_power
    
    Add document about usage of ideapad node in sysfs.
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 98ee69191d3af68e2292528cbb16dcba3d8e2b81
Author: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
Date:   Mon Dec 13 18:00:15 2010 +0800

    ideapad: add platform driver for ideapad
    
    Create /sys/devices/platform/ideapad for nodes of ideapad landing.
    
    Signed-off-by: Ike Panhc <ike.pan@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 9c23225006b695ceba31c035b287f5a7a0b0304e
Author: Namhyung Kim <namhyung@xxxxxxxxx>
Date:   Wed Dec 8 00:04:14 2010 +0900

    fujitsu-laptop: fix compiler warning on pnp_ids
    
    Annotate pnp_ids as '__used' to fix following warning:
    
      CC      drivers/platform/x86/fujitsu-laptop.o
    drivers/platform/x86/fujitsu-laptop.c:1243: warning: â??pnp_idsâ?? defined 
but not used
    
    Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit e1e0dacba5af2b0cd8f9043d0b937296c90bc990
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Mon Dec 6 16:44:23 2010 -0500

    WMI: return error if wmi_create_device() fails
    
    The break resets the retval to 0 but we want to return an error code.
    This was introduced in c64eefd48c4 "WMI: embed struct device directly
    into wmi_block"
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>

commit d358cb55a4cc83c37fbaebc0e4401a573777c6ac
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:14 2010 +0100

    eeepc-wmi: never load if legacy device is enabled
    
    If legacy device (SB.ATKD - ASUS010) used by eeepc-laptop
    is enabled, don't allow eeepc-wmi to load because:
    - eeepc-laptop may be loaded, and can conflict with
      eeepc-wmi (they both try to register eeepc::touchpad
      led for example).
    - the WMI interface is inteded to be used when the OS is
      not detected as Win 7. And when this is the case, the
      ASUS010 device is disabled.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 62a75d83131c8887237d26a36ffeabd53c3640fd
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:13 2010 +0100

    eeepc-laptop: add a getter for touchpad led
    
    Allow te get the current led state in a more accurate way.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit dfed65d56f9a94466bb4afd44ec8e900a6709cda
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:12 2010 +0100

    eeepc-wmi: remove unneeded static
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 4c4edfa3d375109c1360ce786b9df984ca65d727
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:11 2010 +0100

    eeepc-wmi: claim eeepc-wmi maintainership
    
    Since eeepc-wmi has currently no official maintainer, I claim
    maintainership of this driver, and add it to the acpi4asus project.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 2a3f0064f2a06d5a31cddb0e452681d9f884bd8c
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:10 2010 +0100

    eeepc-wmi: fix confusion between ctrl_param and retval
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 8c1b2d83e82e11b9447d7fb3715d6c9764f6f28d
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:09 2010 +0100

    eeepc-wmi: add debugfs entries
    
    eeepc-wmi/    - debugfs root directory
      dev_id      - current dev_id
      ctrl_param  - current ctrl_param
      devs        - call DEVS(dev_id, ctrl_param) and print result
      dsts        - call DSTS(dev_id)  and print result
    
    DEVS and DSTS are the main functions used in eeepc-wmi, this
    will allow to test new features without patching the drivers.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 4e37b42d5ac0d3f505bcdc09028f3fde82031593
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:08 2010 +0100

    eeepc-wmi: use attribute group to manage attributes
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit ba48fdb969d0404d54f6fa0266373afecbbd19d7
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:07 2010 +0100

    eeepc-wmi: add rfkill support for wlan, bluetooth and 3g
    
    wimax support is missing because I don't have any DSDT
    with WMI and wimax support.
    
    Most of the code comes from eeepc-laptop.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 084fca63128849c0961b3cfdb0cd0345e8f51ad8
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:06 2010 +0100

    eeepc-wmi: add touchpad led support
    
    Most of the code comes from eeepc-laptop.
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 27c136c8738f6bec10c26aaf0a486f19edef7bf7
Author: Corentin Chary <corentincj@xxxxxxxxxx>
Date:   Mon Nov 29 08:14:05 2010 +0100

    eeepc-wmi: rework eeepc_wmi_init and eeepc_wmi_exit
    
    The old code was using platform_driver.probe to initialize
    eeepc_wmi context. That's a mistake because if probe fail,
    eeepc_platform_register() won't tell anyone, and chaos will happen.
    
    Wrap add and remove code inside eeepc_wmi_add() / eeepc_wmi_remove(),
    and try to use the static platform_device only in eeepc_wmi_init()
    and eeepc_wmi_exit()
    
    The code is now very similar to eeepc-laptop, except eeepc_laptop_add
    and eeepc_laptop_remove are called from acpi_driver, not module
    init/exit functions, but WMI doesn't provide such functionalities (yet ?).
    
    Signed-off-by: Corentin Chary <corentincj@xxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 72135d21b587debcbcc57e0dbcc8bcfa4dacb661
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date:   Mon Dec 6 16:46:19 2010 -0500

    classmate-laptop: add missing input_sync call
    
    Add missing input_sync call in cmpc_keys_handler function.
    
    Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
    Acked-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>

commit 698e1641a37f833dd26ee2fde5eed426cd97880b
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date:   Tue Nov 30 16:30:43 2010 -0200

    classmate-laptop: little optimization for cmpc_rfkill_block
    
    We don't need to call bios/acpi (cmpc_set_rfkill_wlan) if the blocked
    state is already set to the same value (little optimization). This can
    happen for example if we initialize the module with same initial
    hardware state (rfkill core always call cmpc_rfkill_block on
    initialization here).
    
    Also GWRI method only accepts 0 or 1 for setting rfkill block, as can be
    seen on AML code from acpidump->DSDT from a classmate sample I have, so
    should be fine setting state only to 0 or 1 directly.
    
    Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>
    Acked-by: Thadeu Lima de Souza Cascardo <cascardo@xxxxxxxxxxxxxx>

commit 58f6425eb92f54943878b0b3f9c1e51f99c2cb72
Author: Colin King <colin.king@xxxxxxxxxxxxx>
Date:   Fri Nov 19 15:40:02 2010 +0000

    WMI: Cater for multiple events with same GUID
    
    WMI data blocks can contain WMI events with the same GUID but with
    different notifiy_ids, for example volume up/down hotkeys.
    This patch enables a single event handler to be registered and
    unregistered against all events with same GUID but different
    notify_ids.  Since an event handler is passed the notify_id of
    an event it can can differentiate between the different events.
    
    The patch also ensures we only register and unregister a device per
    unique GUID.
    
    Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 3098064d3b4a9bf9d2855b2a89599ad77695e324
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Sun Nov 14 19:04:38 2010 -0800

    drivers/platform/x86: Remove unnecessary semicolons
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit 5369c02d951afc72d68f5f85089160a63d31ca37
Author: Sreedhara DS <sreedhara.ds@xxxxxxxxx>
Date:   Fri Oct 22 15:43:55 2010 +0100

    intel_scu_ipc: Utility driver for intel scu ipc
    
    This driver implements ioctl and interfaces with intel scu ipc driver. It
    is used to access pmic/msic registers from user space and firmware update
    utility.
    
    Signed-off-by: Sreedhara DS <sreedhara.ds@xxxxxxxxx>
    [Extensive clean up and debug]
    Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
    Signed-off-by: Matthew Garrett <mjg@xxxxxxxxxx>

commit ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b
Author: maximilian attems <max@xxxxxxx>
Date:   Fri Jan 7 16:13:06 2011 +0100

    deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
    
    hdrpackage and headerpackage are not intuitive names,
    use proposed alternatives by Michel Marek.
    
    While touching them move the mkdir of the kernel_headers dir up
    and fix it for paranoid umask.
    
    CC: Theodore Ts'o <tytso@xxxxxxx>
    Signed-off-by: maximilian attems <max@xxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 3e5b08cbbf78bedd316904ab0cf3b27119433ee5
Merge: da40d036fd716f0efb2917076220814b1e927ae1 
2af10844eb6ed104f9505bf3a7ba3ceb02264f31
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 13:16:28 2011 -0800

    Merge branch 'usb-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
    
    * 'usb-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
      USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
      USB: serial: ftdi_sio: add support for TIOCSERGETLSR
      USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
      USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
      usb: ehci-omap: fix tll channel enable mask
      usb: ohci-omap3: fix trivial typo
      USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
      USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
      USB: gadget: update ci13xxx to work with g_ether
      USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
      Revert "USB: musb: pm: don't rely fully on clock support"
      Revert "USB: musb: blackfin: pm: make it work"
      USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
      USB: uas: Ensure we only bind to a UAS interface
      USB: uas: Rename sense pipe and sense urb to status pipe and status urb
      USB: uas: Use kzalloc instead of kmalloc
      USB: uas: Fix up the Sense IU
      usb: musb: core: kill unneeded #include's
      DA8xx: assign name to MUSB IRQ resource
      usb: gadget: g_ncm added
      ...
    
    Manually fix up trivial conflicts in USB Kconfig changes in:
        arch/arm/mach-omap2/Kconfig
        arch/sh/Kconfig
        drivers/usb/Kconfig
        drivers/usb/host/ehci-hcd.c
    and annoying chip clock data conflicts in:
        arch/arm/mach-omap2/clock3xxx_data.c
        arch/arm/mach-omap2/clock44xx_data.c

commit da40d036fd716f0efb2917076220814b1e927ae1
Merge: aa58abc20fa85328a9f048e2626c0893691ff284 
c32e061fa19893ce4acf95d97d5613a161f0f1b7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 12:47:02 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 
commits)
      [SCSI] arcmsr: fix write to device check
      [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
      [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
      [SCSI] libiscsi: use bh locking instead of irq with session lock
      [SCSI] libiscsi: do not take host lock in queuecommand
      [SCSI] be2iscsi: fix null ptr when accessing task hdr
      [SCSI] be2iscsi: fix gfp use in alloc_pdu
      [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
      [SCSI] gdth: Add missing call to gdth_ioctl_free
      [SCSI] bfa: remove unused defintions and misc cleanups
      [SCSI] bfa: remove inactive functions
      [SCSI] bfa: replace bfa_assert with WARN_ON
      [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg 
list.
      [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
      [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
      [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX 
parts.
      [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox 
command fails on CNAs.
      [SCSI] qla2xxx: Remove redundant module parameter permission bits
      [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
      [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
      ...

commit aa58abc20fa85328a9f048e2626c0893691ff284
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Fri Jan 7 20:47:37 2011 +0100

    input/tc3589x: fix compile error
    
    There was a semi-colon missing and it broke the compile.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 07fe0351702b6f0c9749e80cdbcb758686b0fe9b
Author: Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 15:49:20 2011 +0000

    spi/omap: Fix DMA API usage in OMAP MCSPI driver
    
    Running the latest kernel on the 4430SDP board with DMA API debugging
    enabled results in this:
    
    WARNING: at lib/dma-debug.c:803 check_unmap+0x19c/0x6f0()
    NULL NULL: DMA-API: device driver tries to free DMA memory it has not 
allocated
    [device address=0x000000008129901a] [size=260 bytes]
    Modules linked in:
    Backtrace:
    [<c003cbe0>] (dump_backtrace+0x0/0x10c) from [<c0278da8>] 
(dump_stack+0x18/0x1c)
     r7:c1839dc0 r6:c0198578 r5:c0304b17 r4:00000323
    [<c0278d90>] (dump_stack+0x0/0x1c) from [<c005b158>] 
(warn_slowpath_common+0x58/0x70)
    [<c005b100>] (warn_slowpath_common+0x0/0x70) from [<c005b214>] 
(warn_slowpath_fmt+0x38/0x40)
     r8:c1839e40 r7:00000000 r6:00000104 r5:00000000 r4:8129901a
    [<c005b1dc>] (warn_slowpath_fmt+0x0/0x40) from [<c0198578>] 
(check_unmap+0x19c/0x6f0)
     r3:c03110de r2:c0304e6b
    [<c01983dc>] (check_unmap+0x0/0x6f0) from [<c0198cd8>] 
(debug_dma_unmap_page+0x74/0x80)
    [<c0198c64>] (debug_dma_unmap_page+0x0/0x80) from [<c01d5ad8>] 
(omap2_mcspi_work+0x514/0xbf0)
    [<c01d55c4>] (omap2_mcspi_work+0x0/0xbf0) from [<c006dfb0>] 
(process_one_work+0x294/0x400)
    [<c006dd1c>] (process_one_work+0x0/0x400) from [<c006e50c>] 
(worker_thread+0x220/0x3f8)
    [<c006e2ec>] (worker_thread+0x0/0x3f8) from [<c00738d0>] (kthread+0x88/0x90)
    [<c0073848>] (kthread+0x0/0x90) from [<c005e924>] (do_exit+0x0/0x5fc)
     r7:00000013 r6:c005e924 r5:c0073848 r4:c1829ee0
    ---[ end trace 1b75b31a2719ed20 ]---
    
    I've no idea why this driver uses NULL for dma_unmap_single instead of
    the &spi->dev that is laying around just waiting to be used in that
    function - but it's an easy fix.
    
    Also replace this comment with a FIXME comment:
                    /* Do DMA mapping "early" for better error reporting and
                     * dcache use.  Note that if dma_unmap_single() ever starts
                     * to do real work on ARM, we'd need to clean up mappings
                     * for previous transfers on *ALL* exits of this loop...
                     */
    as the comment is not true - we do work in dma_unmap() functions,
    particularly on ARMv6 and above.  I've corrected the existing unmap
    functions but if any others are required they must be added ASAP.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
    Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d
Merge: 01539ba2a706ab7d35fc0667dff919ade7f87d63 
05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510
Author: Tony Luck <tony.luck@xxxxxxxxx>
Date:   Fri Jan 7 09:17:33 2011 -0800

    Pull misc2.6.38 into release branch

commit 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510
Author: Tony Luck <tony.luck@xxxxxxxxx>
Date:   Fri Jan 7 09:11:55 2011 -0800

    [IA64] Avoid array overflow if there are too many cpus in SRAT table
    
    acpi_numa_init() has to parse the whole SRAT table, even if the
    kernel wants to limit the number of cpus it will use (because the
    ones it is going to use may be described by entries at the end of
    the SRAT table).  Avoid overflowing the node_cpuid array.
    
    Reported-by: Yinghai Lu <yinghai@xxxxxxxxxx>
    Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

commit 735759389b7143f95ae7badc97511e7e4729e873
Author: Richard Genoud <richard.genoud@xxxxxxxxx>
Date:   Fri Jan 7 15:26:01 2011 +0100

    spi/imx: correct the test on platform_get_irq() return value
    
    The test "if (spi_imx->irq <= 0)" is not testing the IRQ value, but
    the return value of platform_get_irq().  As platform_get_irq() can
    return an error (-ENXIO) or the IRQ value it found, the test should be
    "if (spi_imx->irq < 0)"
    
    [grant.likely: Note: In general, Linux irq number 0 should also mean
    no irq, but arm still allows devices to be assigned 0, and the imx
    platform uses 0 for one of the spi devices, so this patch is needed
    for the device to work]
    
    Signed-off-by: Richard Genoud <richard.genoud@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit b4a45f5fe8078bfc10837dbd5b98735058bc4698
Merge: 01539ba2a706ab7d35fc0667dff919ade7f87d63 
b3e19d924b6eaf2ca7d22cba99a517c5171007b6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Jan 7 08:56:33 2011 -0800

    Merge branch 'vfs-scale-working' of 
git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin
    
    * 'vfs-scale-working' of 
git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 
commits)
      fs: scale mntget/mntput
      fs: rename vfsmount counter helpers
      fs: implement faster dentry memcmp
      fs: prefetch inode data in dcache lookup
      fs: improve scalability of pseudo filesystems
      fs: dcache per-inode inode alias locking
      fs: dcache per-bucket dcache hash locking
      bit_spinlock: add required includes
      kernel: add bl_list
      xfs: provide simple rcu-walk ACL implementation
      btrfs: provide simple rcu-walk ACL implementation
      ext2,3,4: provide simple rcu-walk ACL implementation
      fs: provide simple rcu-walk generic_check_acl implementation
      fs: provide rcu-walk aware permission i_ops
      fs: rcu-walk aware d_revalidate method
      fs: cache optimise dentry and inode for rcu-walk
      fs: dcache reduce branches in lookup path
      fs: dcache remove d_mounted
      fs: fs_struct use seqlock
      fs: rcu-walk for path lookup
      ...

commit e68077856e599cd33d8cd5db15762df60c29d361
Author: maximilian attems <max@xxxxxxx>
Date:   Sat Jan 1 16:44:13 2011 +0100

    deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
    
    userland dev likes latest incarnation of that userland API.
    make it easy to also build it on make deb-pkg invocation:
    
    dpkg-deb: building package `linux-libc-dev' in 
`../linux-libc-dev_2.6.32-rc6-4_amd64.deb'.
    
    Last year patch rebased on top of latest deb-pkg changes.
    
    Signed-off-by: maximilian attems <max@xxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067
Author: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Date:   Tue Dec 21 14:18:49 2010 +0800

    xen: HVM X2APIC support
    
    This patch is similiar to Gleb Natapov's patch for KVM, which enable the
    hypervisor to emulate x2apic feature for the guest. By this way, the 
emulation
    of lapic would be simpler with x2apic interface(MSR), and faster.
    
    [v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion]
    
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
    Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

commit 2904ed8dd5a748c52caf4d8b09d3d9834b5932fa
Author: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
Date:   Tue Dec 21 14:18:48 2010 +0800

    apic: Move hypervisor detection of x2apic to hypervisor.h
    
    Then we can reuse it for Xen later.
    
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
    Acked-by: Avi Kivity <avi@xxxxxxxxxx>
    Acked-by: Ingo Molnar <mingo@xxxxxxx>
    Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

commit c9b5f501ef1580faa30c40c644b7691870462201
Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Date:   Fri Jan 7 13:41:40 2011 +0100

    sched: Constify function scope static struct sched_param usage
    
    Function-scope statics are discouraged because they are
    easily overlooked and can cause subtle bugs/races due to
    their global (non-SMP safe) nature.
    
    Linus noticed that we did this for sched_param - at minimum
    make the const.
    
    Suggested-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: Message-ID: 
<AANLkTinotRxScOHEb0HgFgSpGPkq_6jKTv5CfvnQM=ee@xxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 524429c31b486c05449666b94613f59f729c0a84
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date:   Thu Jan 6 20:58:12 2011 +0800

    sched: Fix strncmp operation
    
    One of the operands, buf, is incorrect, since it is stripped and the
    correct address for subsequent string comparing could change if
    leading white spaces, if any, are removed from buf.
    
    It is fixed by replacing buf with cmp.
    
    Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: 
<AANLkTinOPuYsVovrZpbuCCmG5deEyc8WgA_A1RJx_YK7@xxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 1c5354de90c900b369e2ebd36c3a065ede29eb93
Author: Mike Galbraith <efault@xxxxxx>
Date:   Wed Jan 5 11:16:04 2011 +0100

    sched: Move sched_autogroup_exit() to free_signal_struct()
    
    Per Oleg's suggestion, undo fork failure free/put_signal_struct change,
    and move sched_autogroup_exit() to free_signal_struct() instead.
    
    Signed-off-by: Mike Galbraith <efault@xxxxxx>
    Reviewed-by: Oleg Nesterov <oleg@xxxxxxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <1294222564.8369.6.camel@xxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit e9aa1dd19fe49b5aed3ca94aab87576e534d2a39
Author: Mike Galbraith <efault@xxxxxx>
Date:   Wed Jan 5 11:11:25 2011 +0100

    sched: Fix struct autogroup memory leak
    
    Seems I lost a change somewhere, leaking memory.
    
    sched: fix struct autogroup memory leak
    
    Add missing change to actually use autogroup_free().
    
    Signed-off-by: Mike Galbraith <efault@xxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <1294222285.8369.2.camel@xxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 0ca0873555c0abe17b28c25b19f82857c0ddd2bc
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date:   Fri Jan 7 12:43:45 2011 +0800

    sched: Mark autogroup_init() __init
    
    autogroup_init() is only called at boot time.
    
    Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <1294375425-31065-1-git-send-email-yong.zhang0@xxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 07e06b011db2b3300f6c975ebf293fc4c8c59942
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date:   Fri Jan 7 15:17:36 2011 +0800

    sched: Consolidate the name of root_task_group and init_task_group
    
    root_task_group is the leftover of USER_SCHED, now it's always
    same to init_task_group.
    But as Mike suggested, root_task_group is maybe the suitable name
    to keep for a tree.
    So in this patch:
      init_task_group      --> root_task_group
      init_task_group_load --> root_task_group_load
      INIT_TASK_GROUP_LOAD --> ROOT_TASK_GROUP_LOAD
    
    Suggested-by: Mike Galbraith <efault@xxxxxx>
    Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <20110107071736.GA32635@xxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 39177ec36236fb71257e51d0d198437b84170911
Author: Peter Korsgaard <jacmet@xxxxxxxxxx>
Date:   Thu Jan 6 16:42:45 2011 +0100

    nconf: handle comment entries within choice/endchoice
    
    Equivalent to af6c1598 (kconfig: handle comment entries within
    choice/endchoice), but for nconfig instead.
    
    Implement support for comment entries within choice groups. Comment entries
    are displayed visually distinct from normal configs, and selecting them is
    a no-op.
    
    Signed-off-by: Peter Korsgaard <jacmet@xxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit bc91c9f313309915f6ec767f56f78dcd0305b20f
Author: Roland Stigge <stigge@xxxxxxxxx>
Date:   Fri Dec 17 17:19:17 2010 +0100

    mkuboot.sh: Fail if mkimage is missing
    
    on building an uImage, I get:
    
    $ make uImage
      CHK     include/linux/version.h
      CHK     include/generated/utsrelease.h
    make[1]: `include/generated/mach-types.h' is up to date.
      CALL    scripts/checksyscalls.sh
      CHK     include/generated/compile.h
      Kernel: arch/arm/boot/Image is ready
      SHIPPED arch/arm/boot/compressed/lib1funcs.S
      AS      arch/arm/boot/compressed/lib1funcs.o
      LD      arch/arm/boot/compressed/vmlinux
      OBJCOPY arch/arm/boot/zImage
      Kernel: arch/arm/boot/zImage is ready
      UIMAGE  arch/arm/boot/uImage
    "mkimage" command not found - U-Boot images will not be built
      Image arch/arm/boot/uImage is ready
    $
    
    I.e. it says: "uImage is ready" even though the uImage file doesn't
    exist because mkimage is missing.
    
    I propose the attached patch.
    
    Signed-off-by: Roland Stigge <stigge@xxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 1c2a48cf65580a276552151eb8f78d78c55b828e
Merge: 0aa002fe602939370e9476e5ec32b562000a0425 
cb600d2f83c854ec3d6660063e4466431999489b
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Fri Jan 7 14:14:15 2011 +0100

    Merge branch 'linus' into x86/apic-cleanups
    
    Conflicts:
        arch/x86/include/asm/io_apic.h
    
    Merge reason: Resolve the conflict, update to a more recent -rc base
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Thu Oct 14 13:34:03 2010 -0400

    m68knommu: Need to check __get_user()/__put_user() result
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 8972be4d44fbec0b2e1d7b68874fb61c5bf7b06a
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Tue Oct 12 22:38:04 2010 -0400

    m68knommu: signal.c __user annotations
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit a19185c32dbe975ce1ee86f5fa457f69b1d7f53b
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Tue Oct 12 22:26:22 2010 -0400

    m68knommu: Equivalent of "m68k: handle new gcc's"
    
    ... from back in 2004; again, it's ifdefed out by CONFIG_FPU.
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit e64f1b7520fa12c8e8e08161a2841ec5510774ac
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Tue Oct 12 22:19:54 2010 -0400

    m68knommu: f_pcr has been gone since headers' merge
    
    sure, it's effectively ifdefed out, but still...
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 089e449a82cd5ba8a858dfea88e754afb9341037
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Mon Oct 11 23:35:08 2010 -0400

    m68knommu: Don't lose state if sigframe setup fails
    
    exact parallel to m68k analog
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit d1574df7e01d427c2ed80ada11433a72907ca472
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Mon Oct 11 23:29:28 2010 -0400

    m68knommu: Handle multiple pending signals
    
    we shouldn't bugger off to userland when there still are
    pending signals; among other things it makes e.g. SIGSEGV
    triggered by failure to build a sigframe to be delivered
    _now_ and not when we hit the next syscall or interrupt.
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 710e91e455caf5cfec02892d667b41f312ec166c
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Mon Oct 11 17:09:20 2010 -0400

    m68knommu: Switch to saner sigsuspend
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit bf814b45d560b22e8657ca44d0ae6941ab9d8d36
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Mon Oct 11 16:56:23 2010 -0400

    m68knommu: Don't bother with SA_ONESHOT
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 8c18194f6c0a638565f2074d1dcabfbe590f396d
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Thu Oct 14 13:35:05 2010 -0400

    m68k: Check __get_user()/__put_user() return value
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit bd6f56a75bb2a65b3a1b8d14a9787fdaadae71c1
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Mon Oct 11 23:13:51 2010 -0400

    m68k: Missing syscall_trace() on sigreturn
    
    If we leave sigreturn via ret_from_signal, we end up with syscall
    trace only on entry, leading to very unhappy strace, among other
    things.  Note that this means different behaviours for signals
    delivered while we were in pagefault and for ones delivered while
    we were in interrupt...
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit ea52b58ccbda49aeb23eb424ce05bba3cb0bc976
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Wed Oct 6 14:09:43 2010 -0400

    m68k: Fix stack mangling logics in sigreturn
    
    a) we should hold modifying regs->format until we know we *will* be
    doing stack expansion; otherwise attacker can modify sigframe to
    have wrong ->sc_formatvec and install SIGSEGV handler.
    
    b) we should *not* mix copying saved extra stuff from userland with
    expanding the stack; once we'd done that manual memmove, we'd better
    not return to C, so cleanup is very hard to do.  The easiest way
    is to copy it on stack first, making sure we won't overwrite on stack
    expansion.  Fortunately that's easy to do...
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 90731d7537317ad5d9672187f7a1dff90b29bb12
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Sun Oct 3 01:36:58 2010 -0400

    m68k: If we fail to set sigframe up, just leave regs alone...
    
    Same principle as with the previous patch - do not destroy the
    state if sigframe setup fails.  Incidentally, it's actually
    _less_ work - we don't need to go through adjust_stack dance
    on failure if we don't touch regs->stkadj until we know we'd
    written sigframe out.
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit f85741eb5fb2653fd9138b4bef68396615c720f7
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Sun Oct 3 01:15:49 2010 -0400

    m68k: Don't lose state if sigframe setup fails
    
    If we'd failed in setup_frame(), we've no place to store
    the original sigmask.  It's not an unrecoverable situation -
    we raise SIGSEGV, but that SIGSEGV might be successfully
    handled (e.g. on altstack).  In that case we really don't
    want sa_mask of original signal permanently slapped on
    the set of blocked signals.
    
    Standard solution: have setup_frame()/setup_rt_frame()
    report failure and don't mess with the signal-related
    state if that has happened...
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 9e4930dbf17c1eba72631cd52a0c621da3d1a816
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Sat Oct 2 22:57:30 2010 -0400

    m68k: Simplify the singlestepping handling in signals
    
    Instead of checking the return value of do_signal() we can just do
    the work (raise SIGTRAP and clear SR.T1) directly in handle_signal(),
    when setting the sigframe up.  Simplifies the assembler glue and is
    closer to the way we do it on other targets.
    
    Note that do_delayed_trace does *not* disappear; it's still needed
    to deal with single-stepping through syscall, since 68040 doesn't
    raise the trace exception at all if the trap exception is pending.
    We hit it after returning from sys_...() if TIF_DELAYED_TRACE is
    set; all that has changed is that we don't reuse it for "single-step
    into the handler" codepath.
    
    As the result, do_signal() doesn't need to return anything anymore.
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit e68847fee706c6fe74c9afc3288c3adfc131b1fa
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Wed Sep 29 23:28:59 2010 -0400

    m68k: Switch to saner sigsuspend()
    
    and saner do_signal() arguments, while we are at it
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 35fc157baf56db846afaeb5c730fa47e351cf0d2
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Wed Sep 29 23:10:47 2010 -0400

    m68k: Resetting sa_handler in local copy of k_sigaction is pointless
    
    ... and had been such since the introduction of get_signal_to_deliver()
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

commit 6d5db4668796d903dc3bad2852c82073509c37d2
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Thu Nov 25 15:40:27 2010 +0100

    EDAC, MCE: Fix NB error formatting
    
    Minor formatting fixup since the information which core was associated
    with the MCE is not always valid.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 50adbbd8a8e572ad2533eace228c841ec84028a3
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Sat Nov 13 11:44:26 2010 -0500

    EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
    
    Building for X86_32 produces shift count warnings, so use BIT_64() to
    eliminate the warnings.
    
    drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
    drivers/edac/mce_amd.c:778: warning: left shift count >= width of type
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: Doug Thompson <dougthompson@xxxxxxxxxxxx>
    Cc: bluesmoke-devel@xxxxxxxxxxxxxxxxxxxxx
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit bad11e031862294265145d87dd4be1ae4af0d57f
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 17:44:51 2010 +0200

    EDAC, MCE: Enable MCE decoding on F15h
    
    Now that everything is inplace, enable MCE decoding on F15h. Make
    initcall routine a bit more readable.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Tue Nov 9 19:41:49 2010 +0100

    EDAC, MCE: Allow F15h bank 6 MCE injection
    
    F15h adds a sixth MCE bank: adjust bank number check in the injection
    code.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit fa7ae8cc8c88c0679eab24c5a1b5d3b134a5f542
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 17:42:27 2010 +0200

    EDAC, MCE: Shorten error report formatting
    
    Shorten up MCi_STATUS flags and add BD's new deferred and poison types.
    Also, simplify formatting.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 6245288232516aadf293f575d1812dafb4696aee
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 16:08:37 2010 +0200

    EDAC, MCE: Overhaul error fields extraction macros
    
    Make macro names shorter thus making code shorter and more clear.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit b8f85c477bdf1fec98ea7cbe952fdb5f40eb0aa7
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 15:37:58 2010 +0200

    EDAC, MCE: Add F15h FP MCE decoder
    
    Add decoder for FP MCEs.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 8259a7e5724c42c89d927b92cda3e0ab15b9ade9
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 15:28:59 2010 +0200

    EDAC, MCE: Add F15 EX MCE decoder
    
    Integrate the single FIROB signature into an expanded table along with
    the new BD MCE types.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 05cd667d668eb08845dd49c02130e5223121b715
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 15:06:24 2010 +0200

    EDAC, MCE: Add an F15h NB MCE decoder
    
    by (almost) reusing the F10h one since the signatures are the same.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit b18434cad1740466f7a1c304ea4af0f4d3c874f1
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Sep 22 11:53:32 2010 +0200

    EDAC, MCE: No F15h LS MCE decoder
    
    F15h BD doesn't generate LS MCEs so warn about it.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 70fdb494aa8c82f76745d5a32b8abc505813557c
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Tue Sep 21 20:45:10 2010 +0200

    EDAC, MCE: Add F15h CU MCE decoder
    
    MCE bank 2 is redefined from a BU to a CU (Combined Unit) bank on F15h.
    Add a decoder function for CU MCEs.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 86039cd401e1780573733870f9c0bd458fc96ea2
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Mon Nov 8 15:03:35 2010 +0100

    EDAC, MCE: Add F15h IC MCE decoder
    
    Add support for decoding F15h IC MCEs.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 25a4f8b05917f8137bfff8a3f8c6c8c1ac561208
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Sep 17 19:22:34 2010 +0200

    EDAC, MCE: Add F15h DC MCE decoder
    
    Add a decoder for F15h DC MCEs to support the new types of DC MCEs
    introduced by the BD microarchitecture.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 2be64bfac71378e1aa8c20031a499bd55e391244
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Sep 17 19:11:47 2010 +0200

    EDAC, MCE: Select extended error code mask
    
    F15h enlarges the extended error code of an MCE to a 5-bit field
    (MCi_STATUS[20:16]). Add a mask variable which default 0xf is overridden
    on F15h.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit a135cef79a2927ecff800492a26cd314e9cba996
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Nov 26 19:24:44 2010 +0100

    amd64_edac: Disable DRAM ECC injection on K8
    
    K8 does not allow for an atomic RMW to a cacheline as F10h does so
    disable the error injection interface for it.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 390944439f746824faec51b576f50cb5ef18745b
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Nov 24 19:52:09 2010 +0100

    EDAC: Fixup scrubrate manipulation
    
    Make the ->{get|set}_sdram_scrub_rate return the actual scrub rate
    bandwidth it succeeded setting and remove superfluous arg pointer used
    for that. A negative value returned still means that an error occurred
    while setting the scrubrate. Document this for future reference.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 360b7f3c602ed80ce8c6b2585dcb76883a440c17
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 15 19:25:38 2010 +0200

    amd64_edac: Remove two-stage initialization
    
    Now that all prerequisites are in place, drop the two-stage driver
    instances initialization in favor of the following simple init sequence:
    
    1. Probe PCI device: we only test ECC capabilities here and if none exit
    early.
    
    2. If the hw supports ECC and it is/can be enabled, we init the per-node
    instance.
    
    Remove "amd64_" prefix from static functions touched, while at it.
    
    There actually should be no visible functional change resulting from
    this patch.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 2299ef7114000f8e403797b7f9a972f54bc05fad
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 15 17:44:04 2010 +0200

    amd64_edac: Check ECC capabilities initially
    
    Rework the code to check the hardware ECC capabilities at PCI probing
    time. We do all further initialization only if we actually can/have ECC
    enabled.
    
    While at it:
    0. Fix function naming.
    1. Simplify/clarify debug output.
    2. Remove amd64_ prefix from the static functions
    3. Reorganize code.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit ae7bb7c679e7ddba6c52d1a78a30f9bc868d9738
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Thu Oct 14 16:01:30 2010 +0200

    amd64_edac: Carve out ECC-related hw settings
    
    This is in preparation for the init path reorganization where we want
    only to
    
    1) test whether a particular node supports ECC
    2) can it be enabled
    
    and only then do the necessary allocation/initialization. For that,
    we need to decouple the ECC settings of the node from the instance's
    descriptor.
    
    The should be no functional change introduced by this patch.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit f1db274e1ba7004909de4a9cee62f631c030ba3e
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Thu Oct 14 14:37:13 2010 +0200

    amd64_edac: Remove PCI ECS enabling functions
    
    PCI ECS is being enabled by default since 2.6.26 on AMD so this code is
    just superfluous now, remove it.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 027dbd6f5d419c25750d6a26c5c46f46f2093a11
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Oct 13 22:12:15 2010 +0200

    amd64_edac: Remove explicit Kconfig PCI dependency
    
    AMD_NB pulls in the dependency on PCI. Clarify/fix help text while at it.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit cc4d8860fc37dd315b16a43202400d822ab63221
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Wed Oct 13 16:11:59 2010 +0200

    amd64_edac: Allocate driver instances dynamically
    
    Remove static allocation in favor of dynamically allocating space for as
    many driver instances as northbridges present on the system.
    
    There should be no functional change resulting from this patch.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 24f9a7fe3f19f3fd310f556364d01a22911724b3
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Thu Oct 7 18:29:15 2010 +0200

    amd64_edac: Rework printk macros
    
    Add a macro per printk level, shorten up error messages. Add relevant
    information to KERN_INFO level. No functional change.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 8d5b5d9c7b86e44fda29a367db3ccd2815a52f7c
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 20:11:07 2010 +0200

    amd64_edac: Rename CPU PCI devices
    
    Rename variables representing PCI devices to their BKDG names for faster
    search and shorter, clearer code.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit b8cfa02f833a614e80f851747c4ce14989a4cfd0
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 19:35:38 2010 +0200

    amd64_edac: Concentrate per-family init even more
    
    Move the remaining per-family init code into the proper place and
    simplify the rest of the initialization. Reorganize error handling in
    amd64_init_one_instance().
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit bbd0c1f675d7d64fc02393d4985a069be5037b54
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 19:27:58 2010 +0200

    amd64_edac: Cleanup the CPU PCI device reservation
    
    Shorten code and clarify comments, return proper -E* values on error.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 0092b20d4cf3de243b5c82b410ee02644cec2707
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 19:20:05 2010 +0200

    amd64_edac: Simplify CPU family detection
    
    Concentrate CPU family detection in the per-family init function.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 395ae783b384e5243804b07fba3e3f8379ddf1d6
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 18:38:19 2010 +0200

    amd64_edac: Add per-family init function
    
    Run a per-family init function which does all the settings based on
    the family this driver instance is running on. Move the scrubrate
    calculation in it and simplify code.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 9f56da0e3c3269abe0b2745a54f1b082c3c14433
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 19:44:53 2010 +0200

    amd64_edac: Use cached extended CPU model
    
    ... instead of computing it needlessly again.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit 3ab0e7dc2e1d5598da609ec9a9bcd3b69b8fa654
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
Date:   Fri Oct 1 18:19:06 2010 +0200

    amd64_edac: Remove F11h support
    
    F11h doesn't support DRAM ECC so whack it away.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>

commit b3e19d924b6eaf2ca7d22cba99a517c5171007b6
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:11 2011 +1100

    fs: scale mntget/mntput
    
    The problem that this patch aims to fix is vfsmount refcounting scalability.
    We need to take a reference on the vfsmount for every successful path 
lookup,
    which often go to the same mount point.
    
    The fundamental difficulty is that a "simple" reference count can never be 
made
    scalable, because any time a reference is dropped, we must check whether 
that
    was the last reference. To do that requires communication with all other 
CPUs
    that may have taken a reference count.
    
    We can make refcounts more scalable in a couple of ways, involving keeping
    distributed counters, and checking for the global-zero condition less
    frequently.
    
    - check the global sum once every interval (this will delay zero detection
      for some interval, so it's probably a showstopper for vfsmounts).
    
    - keep a local count and only taking the global sum when local reaches 0 
(this
      is difficult for vfsmounts, because we can't hold preempt off for the 
life of
      a reference, so a counter would need to be per-thread or tied strongly to 
a
      particular CPU which requires more locking).
    
    - keep a local difference of increments and decrements, which allows us to 
sum
      the total difference and hence find the refcount when summing all CPUs. 
Then,
      keep a single integer "long" refcount for slow and long lasting 
references,
      and only take the global sum of local counters when the long refcount is 
0.
    
    This last scheme is what I implemented here. Attached mounts and process 
root
    and working directory references are "long" references, and everything else 
is
    a short reference.
    
    This allows scalable vfsmount references during path walking over mounted
    subtrees and unattached (lazy umounted) mounts with processes still running
    in them.
    
    This results in one fewer atomic op in the fastpath: mntget is now just a
    per-CPU inc, rather than an atomic inc; and mntput just requires a spinlock
    and non-atomic decrement in the common case. However code is otherwise 
bigger
    and heavier, so single threaded performance is basically a wash.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit c6653a838b1b2738561aff0b8c0f62a9b714bdd9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:10 2011 +1100

    fs: rename vfsmount counter helpers
    
    Suggested by Andreas, mnt_ prefix is clearer namespace, follows kernel
    conventions better, and is easier for tab complete. I introduced these
    names so I'll admit they were not good choices.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 9d55c369bb5e695e629bc35cba2ef607755b3bee
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:09 2011 +1100

    fs: implement faster dentry memcmp
    
    The standard memcmp function on a Westmere system shows up hot in
    profiles in the `git diff` workload (both parallel and single threaded),
    and it is likely due to the costs associated with trapping into
    microcode, and little opportunity to improve memory access (dentry
    name is not likely to take up more than a cacheline).
    
    So replace it with an open-coded byte comparison. This increases code
    size by 8 bytes in the critical __d_lookup_rcu function, but the
    speedup is huge, averaging 10 runs of each:
    
    git diff st   user   sys   elapsed  CPU
    before        1.15   2.57  3.82      97.1
    after         1.14   2.35  3.61      96.8
    
    git diff mt   user   sys   elapsed  CPU
    before        1.27   3.85  1.46     349
    after         1.26   3.54  1.43     333
    
    Elapsed time for single threaded git diff at 95.0% confidence:
            -0.21  +/- 0.01
            -5.45% +/- 0.24%
    
    It's -0.66% +/- 0.06% elapsed time on my Opteron, so rep cmp costs on the
    fam10h seem to be relatively smaller, but there is still a win.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit e1bb57826381199cc79fbf44e9dfeee58fc7b339
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:08 2011 +1100

    fs: prefetch inode data in dcache lookup
    
    This makes single threaded git diff -1.25% +/- 0.05% elapsed time on my
    2s12c24t Westmere system, and -0.86% +/- 0.05% on my 2s8c Barcelona, by
    prefetching the important first cacheline of the inode in while we do the
    actual name compare and other operations on the dentry.
    
    There was no measurable slowdown in the single file stat case, or the creat
    case (where negative dentries would be common).
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 4b936885ab04dc6e0bb0ef35e0e23c1a7364d9e5
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:07 2011 +1100

    fs: improve scalability of pseudo filesystems
    
    Regardless of how much we possibly try to scale dcache, there is likely
    always going to be some fundamental contention when adding or removing 
children
    under the same parent. Pseudo filesystems do not seem need to have connected
    dentries because by definition they are disconnected.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 873feea09ebc980cbd3631b767356ce1eee65ec1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:06 2011 +1100

    fs: dcache per-inode inode alias locking
    
    dcache_inode_lock can be replaced with per-inode locking. Use existing
    inode->i_lock for this. This is slightly non-trivial because we sometimes
    need to find the inode from the dentry, which requires d_inode to be
    stabilised (either with refcount or d_lock).
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit ceb5bdc2d246f6d81cf61ed70f325308a11821d2
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:05 2011 +1100

    fs: dcache per-bucket dcache hash locking
    
    We can turn the dcache hash locking from a global dcache_hash_lock into
    per-bucket locking.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 626d607435617cc0f033522083e2bb195b81813c
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:04 2011 +1100

    bit_spinlock: add required includes
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 4e35e6070b1ceed89c3bba2af4216c286fb1dafd
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:03 2011 +1100

    kernel: add bl_list
    
    Introduce a type of hlist that can support the use of the lowest bit in the
    hlist_head. This will be subsequently used to implement per-bucket bit 
spinlock
    for inode and dentry hashes, and may be useful in other cases such as 
network
    hashes.
    
    Reviewed-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 880566e17c4fce0d998d92610d32fcb9506aa6dd
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:02 2011 +1100

    xfs: provide simple rcu-walk ACL implementation
    
    This simple implementation just checks for no ACLs on the inode, and
    if so, then the rcu-walk may proceed, otherwise fail it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 258a5aa8dfc6294f5f7df892023ee4d3e57c9841
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:01 2011 +1100

    btrfs: provide simple rcu-walk ACL implementation
    
    This simple implementation just checks for no ACLs on the inode, and
    if so, then the rcu-walk may proceed, otherwise fail it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 73598611ade7c85f0c3d52ba5130103f6709c6d3
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:50:00 2011 +1100

    ext2,3,4: provide simple rcu-walk ACL implementation
    
    This simple implementation just checks for no ACLs on the inode, and
    if so, then the rcu-walk may proceed, otherwise fail it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:59 2011 +1100

    fs: provide simple rcu-walk generic_check_acl implementation
    
    This simple implementation just checks for no ACLs on the inode, and
    if so, then the rcu-walk may proceed, otherwise fail it.
    
    This could easily be extended to put acls under RCU and check them
    under seqlock, if need be. But this implementation is enough to show
    the rcu-walk aware permissions code for path lookups is working, and
    will handle cases where there are no ACLs or ACLs in just the final
    element.
    
    This patch implicity converts tmpfs to rcu-aware permission check.
    Subsequent patches onvert ext*, xfs, and, btrfs. Each of these uses
    acl/permission code in a different way, so convert them all to provide
    templates and proof of concept.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit b74c79e99389cd79b31fcc08f82c24e492e63c7e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:58 2011 +1100

    fs: provide rcu-walk aware permission i_ops
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 34286d6662308d82aed891852d04c7c3a2649b16
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:57 2011 +1100

    fs: rcu-walk aware d_revalidate method
    
    Require filesystems be aware of .d_revalidate being called in rcu-walk
    mode (nd->flags & LOOKUP_RCU). For now do a simple push down, returning
    -ECHILD from all implementations.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 44a7d7a878c9cbb74f236ea755b25b6b2e26a9a9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:56 2011 +1100

    fs: cache optimise dentry and inode for rcu-walk
    
    Put dentry and inode fields into top of data structure.  This allows RCU 
path
    traversal to perform an RCU dentry lookup in a path walk by touching only 
the
    first 56 bytes of the dentry.
    
    We also fit in 8 bytes of inline name in the first 64 bytes, so for short
    names, only 64 bytes needs to be touched to perform the lookup. We should
    get rid of the hash->prev pointer from the first 64 bytes, and fit 16 bytes
    of name in there, which will take care of 81% rather than 32% of the kernel
    tree.
    
    inode is also rearranged so that RCU lookup will only touch a single 
cacheline
    in the inode, plus one in the i_ops structure.
    
    This is important for directory component lookups in RCU path walking. In 
the
    kernel source, directory names average is around 6 chars, so this works.
    
    When we reach the last element of the lookup, we need to lock it and take 
its
    refcount which requires another cacheline access.
    
    Align dentry and inode operations structs, so members will be at predictable
    offsets and we can group common operations into head of structure.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit fb045adb99d9b7c562dc7fef834857f78249daa1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:55 2011 +1100

    fs: dcache reduce branches in lookup path
    
    Reduce some branches and memory accesses in dcache lookup by adding dentry
    flags to indicate common d_ops are set, rather than having to check them.
    This saves a pointer memory access (dentry->d_op) in common path lookup
    situations, and saves another pointer load and branch in cases where we
    have d_op but not the particular operation.
    
    Patched with:
    
    git grep -E '[.>]([[:space:]])*d_op([[:space:]])*=' | xargs sed -e 
's/\([^\t ]*\)->d_op = \(.*\);/d_set_d_op(\1, \2);/' -e 's/\([^\t ]*\)\.d_op = 
\(.*\);/d_set_d_op(\&\1, \2);/' -i
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:54 2011 +1100

    fs: dcache remove d_mounted
    
    Rather than keep a d_mounted count in the dentry, set a dentry flag instead.
    The flag can be cleared by checking the hash table to see if there are any
    mounts left, which is not time critical because it is performed at detach 
time.
    
    The mounted state of a dentry is only used to speculatively take a look in 
the
    mount hash table if it is set -- before following the mount, vfsmount lock 
is
    taken and mount re-checked without races.
    
    This saves 4 bytes on 32-bit, nothing on 64-bit but it does provide a hole I
    might use later (and some configs have larger than 32-bit spinlocks which 
might
    make use of the hole).
    
    Autofs4 conversion and changelog by Ian Kent <raven@xxxxxxxxxx>:
    In autofs4, when expring direct (or offset) mounts we need to ensure that we
    block user path walks into the autofs mount, which is covered by another 
mount.
    To do this we clear the mounted status so that follows stop before walking 
into
    the mount and are essentially blocked until the expire is completed. The
    automount daemon still finds the correct dentry for the umount due to the
    follow mount logic in fs/autofs4/root.c:autofs4_follow_link(), which is set 
as
    an inode operation for direct and offset mounts only and is called following
    the lookup that stopped at the covered mount.
    
    At the end of the expire the covering mount probably has gone away so the
    mounted status need not be restored. But we need to check this and only 
restore
    the mounted status if the expire failed.
    
    XXX: autofs may not work right if we have other mounts go over the top of 
it?
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit c28cc36469554dc55540f059fbdc7fa22a2c31fc
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:53 2011 +1100

    fs: fs_struct use seqlock
    
    Use a seqlock in the fs_struct to enable us to take an atomic copy of the
    complete cwd and root paths. Use this in the RCU lookup path to avoid a
    thread-shared spinlock in RCU lookup operations.
    
    Multi-threaded apps may now perform path lookups with scalability matching
    multi-process apps. Operations such as stat(2) become very scalable for
    multi-threaded workload.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 31e6b01f4183ff419a6d1f86177cbf4662347cec
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:52 2011 +1100

    fs: rcu-walk for path lookup
    
    Perform common cases of path lookups without any stores or locking in the
    ancestor dentry elements. This is called rcu-walk, as opposed to the current
    algorithm which is a refcount based walk, or ref-walk.
    
    This results in far fewer atomic operations on every path element,
    significantly improving path lookup performance. It also avoids cacheline
    bouncing on common dentries, significantly improving scalability.
    
    The overall design is like this:
    * LOOKUP_RCU is set in nd->flags, which distinguishes rcu-walk from 
ref-walk.
    * Take the RCU lock for the entire path walk, starting with the acquiring
      of the starting path (eg. root/cwd/fd-path). So now dentry refcounts are
      not required for dentry persistence.
    * synchronize_rcu is called when unregistering a filesystem, so we can
      access d_ops and i_ops during rcu-walk.
    * Similarly take the vfsmount lock for the entire path walk. So now mnt
      refcounts are not required for persistence. Also we are free to perform 
mount
      lookups, and to assume dentry mount points and mount roots are stable up 
and
      down the path.
    * Have a per-dentry seqlock to protect the dentry name, parent, and inode,
      so we can load this tuple atomically, and also check whether any of its
      members have changed.
    * Dentry lookups (based on parent, candidate string tuple) recheck the 
parent
      sequence after the child is found in case anything changed in the parent
      during the path walk.
    * inode is also RCU protected so we can load d_inode and use the inode for
      limited things.
    * i_mode, i_uid, i_gid can be tested for exec permissions during path walk.
    * i_op can be loaded.
    
    When we reach the destination dentry, we lock it, recheck lookup sequence,
    and increment its refcount and mountpoint refcount. RCU and vfsmount locks
    are dropped. This is termed "dropping rcu-walk". If the dentry refcount does
    not match, we can not drop rcu-walk gracefully at the current point in the
    lokup, so instead return -ECHILD (for want of a better errno). This signals 
the
    path walking code to re-do the entire lookup with a ref-walk.
    
    Aside from the final dentry, there are other situations that may be 
encounted
    where we cannot continue rcu-walk. In that case, we drop rcu-walk (ie. take
    a reference on the last good dentry) and continue with a ref-walk. Again, if
    we can drop rcu-walk gracefully, we return -ECHILD and do the whole lookup
    using ref-walk. But it is very important that we can continue with ref-walk
    for most cases, particularly to avoid the overhead of double lookups, and to
    gain the scalability advantages on common path elements (like cwd and root).
    
    The cases where rcu-walk cannot continue are:
    * NULL dentry (ie. any uncached path element)
    * parent with d_inode->i_op->permission or ACLs
    * dentries with d_revalidate
    * Following links
    
    In future patches, permission checks and d_revalidate become rcu-walk 
aware. It
    may be possible eventually to make following links rcu-walk aware.
    
    Uncached path elements will always require dropping to ref-walk mode, at the
    very least because i_mutex needs to be grabbed, and objects allocated.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 3c22cd5709e8143444a6d08682a87f4c57902df3
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:51 2011 +1100

    kernel: optimise seqlock
    
    Add branch annotations for seqlock read fastpath, and introduce
    __read_seqcount_begin and __read_seqcount_end functions, that can avoid the
    smp_rmb() if used carefully. These will be used by store-free path walking
    algorithm performance is critical and seqlocks are in use.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit ff0c7d15f9787b7e8c601533c015295cc68329f8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:50 2011 +1100

    fs: avoid inode RCU freeing for pseudo fs
    
    Pseudo filesystems that don't put inode on RCU list or reachable by
    rcu-walk dentries do not need to RCU free their inodes.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:49 2011 +1100

    fs: icache RCU free inodes
    
    RCU free the struct inode. This will allow:
    
    - Subsequent store-free path walking patch. The inode must be consulted for
      permissions when walking, so an RCU inode reference is a must.
    - sb_inode_list_lock to be moved inside i_lock because sb list walkers who 
want
      to take i_lock no longer need to take sb_inode_list_lock to walk the list 
in
      the first place. This will simplify and optimize locking.
    - Could remove some nested trylock loops in dcache code
    - Could potentially simplify things a bit in VM land. Do not need to take 
the
      page lock to follow page->mapping.
    
    The downsides of this is the performance cost of using RCU. In a simple
    creat/unlink microbenchmark, performance drops by about 10% due to 
inability to
    reuse cache-hot slab objects. As iterations increase and RCU freeing starts
    kicking over, this increases to about 20%.
    
    In cases where inode lifetimes are longer (ie. many inodes may be allocated
    during the average life span of a single inode), a lot of this cache reuse 
is
    not applicable, so the regression caused by this patch is smaller.
    
    The cache-hot regression could largely be avoided by using 
SLAB_DESTROY_BY_RCU,
    however this adds some complexity to list walking and store-free path 
walking,
    so I prefer to implement this at a later date, if it is shown to be a win in
    real situations. I haven't found a regression in any non-micro benchmark so 
I
    doubt it will be a problem.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 77812a1ef139d84270d27faacc0630c887411013
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:48 2011 +1100

    fs: consolidate dentry kill sequence
    
    The tricky locking for disposing of a dentry is duplicated 3 times in the
    dcache (dput, pruning a dentry from the LRU, and pruning its ancestors).
    Consolidate them all into a single function dentry_kill.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit ec33679d78f9d653a44ddba10b5fb824c06330a1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:47 2011 +1100

    fs: use RCU in shrink_dentry_list to reduce lock nesting
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit be182bff72fae6a3eb25624b39170c40b72f0909
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:46 2011 +1100

    fs: reduce dcache_inode_lock width in lru scanning
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 89e6054836a7b1e7500cd70a14b5579e752c9250
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:45 2011 +1100

    fs: dcache reduce prune_one_dentry locking
    
    prune_one_dentry can avoid quite a bit of locking in the common case where
    ancestors have an elevated refcount. Alternatively, we could have gone the
    other way and made fewer trylocks in the case where d_count goes to zero, 
but
    is probably less common.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit a734eb458ab2bd11479a27dd54f48e1b26a55845
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:44 2011 +1100

    fs: dcache reduce d_parent locking
    
    Use RCU to simplify locking in dget_parent.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit dc0474be3e27463d4d4a2793f82366eed906f223
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:43 2011 +1100

    fs: dcache rationalise dget variants
    
    dget_locked was a shortcut to avoid the lazy lru manipulation when we 
already
    held dcache_lock (lru manipulation was relatively cheap at that point).
    However, how that the lru lock is an innermost one, we never hold it at any
    caller, so the lock cost can now be avoided. We already have well working 
lazy
    dcache LRU, so it should be fine to defer LRU manipulations to scan time.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 357f8e658bba8a085c4a5d4331e30894be8096b8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:42 2011 +1100

    fs: dcache reduce dcache_inode_lock
    
    dcache_inode_lock can be avoided in d_delete() and d_materialise_unique()
    in cases where it is not required.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 89ad485f01fd83c47f17a128db3bd7b89c0f244f
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:41 2011 +1100

    fs: dcache reduce locking in d_alloc
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 61f3dee4af09528997a970280da240577bf60721
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:40 2011 +1100

    fs: dcache reduce dput locking
    
    It is possible to run dput without taking data structure locks up-front. In
    many cases where we don't kill the dentry anyway, these locks are not 
required.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 58db63d086790eec2ed433f9d8c4962239809cf8
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:39 2011 +1100

    fs: dcache avoid starvation in dcache multi-step operations
    
    Long lived dcache "multi-step" operations which retry on rename seq can
    be starved with a lot of rename activity. If they fail after the 1st pass,
    take the rename_lock for writing to avoid further starvation.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit b5c84bf6f6fa3a7dfdcb556023a62953574b60ee
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:38 2011 +1100

    fs: dcache remove dcache_lock
    
    dcache_lock no longer protects anything. remove it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 949854d02455080d20cd3e1db28a3a18daf7599d
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:37 2011 +1100

    fs: Use rename lock and RCU for multi-step operations
    
    The remaining usages for dcache_lock is to allow atomic, multi-step 
read-side
    operations over the directory tree by excluding modifications to the tree.
    Also, to walk in the leaf->root direction in the tree where we don't have
    a natural d_lock ordering.
    
    This could be accomplished by taking every d_lock, but this would mean a
    huge number of locks and actually gets very tricky.
    
    Solve this instead by using the rename seqlock for multi-step read-side
    operations, retry in case of a rename so we don't walk up the wrong parent.
    Concurrent dentry insertions are not serialised against.  Concurrent deletes
    are tricky when walking up the directory: our parent might have been deleted
    when dropping locks so also need to check and retry for that.
    
    We can also use the rename lock in cases where livelock is a worry (and it
    is introduced in subsequent patch).
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 9abca36087288fe28de4749c71ca003d4b9e3ed0
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:36 2011 +1100

    fs: increase d_name lock coverage
    
    Cover d_name with d_lock in more cases, where there may be concurrent
    modification to it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit b23fb0a60379a95e10c671f646b259ea2558421e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:35 2011 +1100

    fs: scale inode alias list
    
    Add a new lock, dcache_inode_lock, to protect the inode's i_dentry list
    from concurrent modification. d_alias is also protected by d_lock.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 2fd6b7f50797f2e993eea59e0a0b8c6399c811dc
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:34 2011 +1100

    fs: dcache scale subdirs
    
    Protect d_subdirs and d_child with d_lock, except in filesystems that aren't
    using dcache_lock for these anyway (eg. using i_mutex).
    
    Note: if we change the locking rule in future so that ->d_child protection 
is
    provided only with ->d_parent->d_lock, it may allow us to reduce some 
locking.
    But it would be an exception to an otherwise regular locking scheme, so we'd
    have to see some good results. Probably not worthwhile.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit da5029563a0a026c64821b09e8e7b4fd81d3fe1b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:33 2011 +1100

    fs: dcache scale d_unhashed
    
    Protect d_unhashed(dentry) condition with d_lock. This means keeping
    DCACHE_UNHASHED bit in synch with hash manipulations.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit b7ab39f631f505edc2bbdb86620d5493f995c9da
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:32 2011 +1100

    fs: dcache scale dentry refcount
    
    Make d_count non-atomic and protect it with d_lock. This allows us to 
ensure a
    0 refcount dentry remains 0 without dcache_lock. It is also fairly natural 
when
    we start protecting many other dentry members with d_lock.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 2304450783dfde7b0b94ae234edd0dbffa865073
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:31 2011 +1100

    fs: dcache scale lru
    
    Add a new lock, dcache_lru_lock, to protect the dcache LRU list from 
concurrent
    modification. d_lru is also protected by d_lock, which allows LRU lists to 
be
    accessed without the lru lock, using RCU in future patches.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 789680d1ee9311cdf095241dc02bd9784d799cd1
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:30 2011 +1100

    fs: dcache scale hash
    
    Add a new lock, dcache_hash_lock, to protect the dcache hash table from
    concurrent modification. d_hash is also protected by d_lock.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit ec2447c278ee973d35f38e53ca16ba7f965ae33d
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:29 2011 +1100

    hostfs: simplify locking
    
    Remove dcache_lock locking from hostfs filesystem, and move it into dcache
    helpers. All that is required is a coherent path name. Protection from
    concurrent modification of the namespace after path name generation is not
    provided in current code, because dcache_lock is dropped before the path is
    used.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit b1e6a015a580ad145689ad1d6b4aa0e03e6c868b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:28 2011 +1100

    fs: change d_hash for rcu-walk
    
    Change d_hash so it may be called from lock-free RCU lookups. See similar
    patch for d_compare for details.
    
    For in-tree filesystems, this is just a mechanical change.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 621e155a3591962420eacdd39f6f0aa29ceb221e
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:27 2011 +1100

    fs: change d_compare for rcu-walk
    
    Change d_compare so it may be called from lock-free RCU lookups. This
    does put significant restrictions on what may be done from the callback,
    however there don't seem to have been any problems with in-tree fses.
    If some strange use case pops up that _really_ cannot cope with the
    rcu-walk rules, we can just add new rcu-unaware callbacks, which would
    cause name lookup to drop out of rcu-walk mode.
    
    For in-tree filesystems, this is just a mechanical change.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit fb2d5b86aff355a27ebfc132d3c99f4a940cc3fe
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:26 2011 +1100

    fs: name case update method
    
    smpfs and ncpfs want to update a live dentry name in-place. Rather than
    have them open code the locking, provide a documented dcache API.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 2bc334dcc7c77be3700dd443d92a78603f76976b
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:25 2011 +1100

    jfs: dont overwrite dentry name in d_revalidate
    
    Use vfat's method for dealing with negative dentries to preserve case,
    rather than overwrite dentry name in d_revalidate, which is a bit ugly
    and also gets in the way of doing lock-free path walking.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 79eb4dde742fe2e9c9e301432b894a7410261ce7
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:24 2011 +1100

    cifs: dont overwrite dentry name in d_revalidate
    
    Use vfat's method for dealing with negative dentries to preserve case,
    rather than overwrite dentry name in d_revalidate, which is a bit ugly
    and also gets in the way of doing lock-free path walking.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit fe15ce446beb3a33583af81ffe6c9d01a75314ed
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:23 2011 +1100

    fs: change d_delete semantics
    
    Change d_delete from a dentry deletion notification to a dentry caching
    advise, more like ->drop_inode. Require it to be constant and idempotent,
    and not take d_lock. This is how all existing filesystems use the callback
    anyway.
    
    This makes fine grained dentry locking of dput and dentry lru scanning
    much simpler.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 5eef7fa905c814826f518aca2d414ca77508ce30
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:22 2011 +1100

    fs: dcache documentation cleanup
    
    Remove redundant (and incorrect, since dcache RCU lookup) dentry locking
    documentation and point to the canonical document.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit fbc8d4c04626e015b18cc61199f505920abb48f0
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:21 2011 +1100

    config fs: avoid switching ->d_op on live dentry
    
    Switching d_op on a live dentry is racy in general, so avoid it. In this 
case
    it is a negative dentry, which is safer, but there are still concurrent ops
    which may be called on d_op in that case (eg. d_revalidate). So in general
    a filesystem may not do this. Fix configfs so as not to do this.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 5adcee1d8d32d7f305f6f5aaefdbf8f35adca177
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:20 2011 +1100

    cgroup fs: avoid switching ->d_op on live dentry
    
    Switching d_op on a live dentry is racy in general, so avoid it. In this 
case
    it is a negative dentry, which is safer, but there are still concurrent ops
    which may be called on d_op in that case (eg. d_revalidate). So in general
    a filesystem may not do this. Fix cgroupfs so as not to do this.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 3e880fb5e4bb6a012035e3edd0586ee2817c2e24
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:19 2011 +1100

    fs: use fast counters for vfs caches
    
    percpu_counter library generates quite nasty code, so unless you need
    to dynamically allocate counters or take fast approximate value, a
    simple per cpu set of counters is much better.
    
    The percpu_counter can never be made to work as well, because it has an
    indirection from pointer to percpu memory, and it can't use direct
    this_cpu_inc interfaces because it doesn't use static PER_CPU data, so
    code will always be worse.
    
    In the fastpath, it is the difference between this:
    
            incl %gs:nr_dentry      # nr_dentry
    
    and this:
    
            movl    percpu_counter_batch(%rip), %edx        # 
percpu_counter_batch,
            movl    $1, %esi        #,
            movq    $nr_dentry, %rdi        #,
            call    __percpu_counter_add    # (plus I clobber registers)
    
    __percpu_counter_add:
            pushq   %rbp    #
            movq    %rsp, %rbp      #,
            subq    $32, %rsp       #,
            movq    %rbx, -24(%rbp) #,
            movq    %r12, -16(%rbp) #,
            movq    %r13, -8(%rbp)  #,
            movq    %rdi, %rbx      # fbc, fbc
    #APP
    # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1
            movq %gs:kernel_stack,%rax      #, pfo_ret__
    # 0 "" 2
    #NO_APP
            incl    -8124(%rax)     # <variable>.preempt_count
            movq    32(%rdi), %r12  # <variable>.counters, tcp_ptr__
    #APP
    # 78 "lib/percpu_counter.c" 1
            add %gs:this_cpu_off, %r12      # this_cpu_off, tcp_ptr__
    # 0 "" 2
    #NO_APP
            movslq  (%r12),%r13     #* tcp_ptr__, tmp73
            movslq  %edx,%rax       # batch, batch
            addq    %rsi, %r13      # amount, count
            cmpq    %rax, %r13      # batch, count
            jge     .L27    #,
            negl    %edx    # tmp76
            movslq  %edx,%rdx       # tmp76, tmp77
            cmpq    %rdx, %r13      # tmp77, count
            jg      .L28    #,
    .L27:
            movq    %rbx, %rdi      # fbc,
            call    _raw_spin_lock  #
            addq    %r13, 8(%rbx)   # count, <variable>.count
            movq    %rbx, %rdi      # fbc,
            movl    $0, (%r12)      #,* tcp_ptr__
            call    _raw_spin_unlock        #
    .L29:
    #APP
    # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1
            movq %gs:kernel_stack,%rax      #, pfo_ret__
    # 0 "" 2
    #NO_APP
            decl    -8124(%rax)     # <variable>.preempt_count
            movq    -8136(%rax), %rax       #, D.14625
            testb   $8, %al #, D.14625
            jne     .L32    #,
    .L31:
            movq    -24(%rbp), %rbx #,
            movq    -16(%rbp), %r12 #,
            movq    -8(%rbp), %r13  #,
            leave
            ret
            .p2align 4,,10
            .p2align 3
    .L28:
            movl    %r13d, (%r12)   # count,*
            jmp     .L29    #
    .L32:
            call    preempt_schedule        #
            .p2align 4,,6
            jmp     .L31    #
            .size   __percpu_counter_add, .-__percpu_counter_add
            .p2align 4,,15
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 86c8749ede0c59e590de9267066932a26f1ce796
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:18 2011 +1100

    vfs: revert per-cpu nr_unused counters for dentry and inodes
    
    The nr_unused counters count the number of objects on an LRU, and as such 
they
    are synchronized with LRU object insertion and removal and scanning, and
    protected under the LRU lock.
    
    Making it per-cpu does not actually get any concurrency improvements 
because of
    this lock, and summing the counter is much slower, and
    incrementing/decrementing it costs more code size and is slower too.
    
    These counters should stay per-LRU, which currently means global.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit ccd35fb9f4da856b105ea0f1e0cab3702e8ae6ba
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:17 2011 +1100

    kernel: kmem_ptr_validate considered harmful
    
    This is a nasty and error prone API. It is no longer used, remove it.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 786a5e15b613a9cee4fc9139fc3113a5ab0fde79
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Fri Jan 7 17:49:16 2011 +1100

    fs: d_validate fixes
    
    d_validate has been broken for a long time.
    
    kmem_ptr_validate does not guarantee that a pointer can be dereferenced
    if it can go away at any time. Even rcu_read_lock doesn't help, because
    the pointer might be queued in RCU callbacks but not executed yet.
    
    So the parent cannot be checked, nor the name hashed. The dentry pointer
    can not be touched until it can be verified under lock. Hashing simply
    cannot be used.
    
    Instead, verify the parent/child relationship by traversing parent's
    d_child list. It's slow, but only ncpfs and the destaged smbfs care
    about it, at this point.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 554738da71004d96e06fb75f4772dfc3b0f47810
Merge: 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 
a6d38f889750ed6290728a19d9dad577b147c6d0
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date:   Thu Jan 6 22:34:59 2011 -0800

    Merge branch 'next' into for-linus
    
    Conflicts:
        include/linux/input.h

commit 01539ba2a706ab7d35fc0667dff919ade7f87d63
Merge: 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153 
dc69d1af9e8d9cbbabff88bb35a6782187a22229
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 19:13:58 2011 -0800

    Merge branch 'omap-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 
commits)
      omap2: Make OMAP2PLUS select OMAP_DM_TIMER
      OMAP4: hwmod data: Fix alignment and end of line in structurefields
      OMAP4: hwmod data: Move the DMA structures
      OMAP4: hwmod data: Move the smartreflex structures
      OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
      arm: omap: tusb6010: add name for MUSB IRQ
      arm: omap: craneboard: Add USB EHCI support
      omap2+: Initialize serial port for dynamic remuxing for n8x0
      omap2+: Add struct omap_board_data and use it for platform level serial 
init
      omap2+: Allow hwmod state changes to mux pads based on the state changes
      omap2+: Add support for hwmod specific muxing of devices
      omap2+: Add omap_mux_get_by_name
      OMAP2: PM: fix compile error when !CONFIG_SUSPEND
      MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
      OMAP4: Smartreflex framework extensions
      OMAP4: hwmod: Add inital data for smartreflex modules.
      OMAP4: PM: Program correct init voltages for scalable VDDs
      OMAP4: Adding voltage driver support
      OMAP4: Register voltage PMIC parameters with the voltage layer
      OMAP3: PM: Program correct init voltages for VDD1 and VDD2
      ...
    
    Fix up trivial conflict in arch/arm/plat-omap/Kconfig

commit c413521eb4e2d7ffd5ce432a144708d479054bd3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 12:03:22 2011 +0900

    ARM: mach-shmobile: update for SMP changes.
    
    There have likewise been some API updates, so we refactor to use the
    consolidated smp_prepare_cpus().
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit c0312b33daa721a92633181fd4fe508484c81a2d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 12:02:11 2011 +0900

    ARM: mach-shmobile: update for GIC changes.
    
    This fixes up the SMP support to use the refactored GIC APIs.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 6ef9f6fd8eb22f4838e9b0006d16936511e3f7f8
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 11:49:49 2011 +0900

    ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
    
    Use the new linux/clkdev.h to get it building again.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153
Merge: 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 
e3c92215198cb6aa00ad38db2780faa6b72e0a3f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 18:32:12 2011 -0800

    Merge branch 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
      [media] radio-aimslab.c: Fix gcc 4.5+ bug
      [media] cx25821: Fix compilation breakage due to BKL dependency
      [media] v4l2-compat-ioctl32: fix compile warning
      [media] zoran: fix compiler warning
      [media] tda18218: fix compile warning
      [media] ngene: fix compile warning
      [media] DVB: IR support for TechnoTrend CT-3650
      [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
      [media] ir-nec-decoder: fix repeat key issue
      [media] staging: se401 depends on USB
      [media] staging: usbvideo/vicam depends on USB
      [media] soc_camera: Add the ability to bind regulators to soc_camedra 
devices
      [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 
sensor
      [media] v4l: soc-camera: switch to .unlocked_ioctl
      [media] v4l: ov772x: simplify pointer dereference
      [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
      [media] ov9640: use macro to request OmniVision OV9640 sensor private data
      [media] ivtv-i2c: Fix two warnings
      [media] staging/lirc: Update lirc TODO files
      [media] cx88: Remove the obsolete i2c_adapter.id field
      ...

commit 04a186bd2c4d3fd7efdeb91d2e92f4624be3a764
Merge: e9d728f528f9548c8dd013899b23e662fa7b6bca 
661382fe190475c17d0b3a6b5f0350b4f82f5939
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 11:03:37 2011 +0900

    Merge branch 'common/dma' into rmobile-latest

commit 661382fe190475c17d0b3a6b5f0350b4f82f5939
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Thu Jan 6 17:04:50 2011 +0000

    dma: shdma: don't register the global die notifier multiple times
    
    A recent patch has added a die notifier to the shdma driver, however,
    it registers a static die-notifier object in the probe routine, i.e.,
    for each device instance. This is wrong and leads to a system lockup.
    This patch moves the die notifier registration to module init and
    exit routines respectively.
    
    Reported-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit e9d728f528f9548c8dd013899b23e662fa7b6bca
Merge: 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 
6155f77d09b968f591876f368d4843168910449e
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 10:51:35 2011 +0900

    Merge branch 'rmobile/smp' into rmobile-latest
    
    Conflicts:
        arch/arm/Kconfig
        arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 28 08:27:19 2010 +0000

    ARM: mach-shmobile: Rely on run-time IRQ handlers
    
    Remove now unused IRQ demux code. All R-Mobile and
    SH-Mobile processors should register IRQ demux
    handlers during run-time.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit e74a9625f8dcf1a924345b24cec8476c52593df8
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 28 08:27:10 2010 +0000

    ARM: mach-shmobile: Run-time IRQ handler for GIC
    
    Break-out GIC specific IRQ demux code from the file
    entry-macro-intc.S and register during run-time.
    
    Covers sh73a0.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 863b171952dba1a3ce9d345cfe4e93c9fdd42f49
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 28 08:27:01 2010 +0000

    ARM: mach-shmobile: Run-time IRQ handler for INTCA
    
    Break-out INTC specific IRQ demux code from the file
    entry-macro-intc.S and register during run-time.
    
    Covers sh7367, sh7377 and sh7372.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 60f1435c3bab8b88712a4f96806e5ac9396aa49c
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 28 08:26:52 2010 +0000

    ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
    
    Always enable MULTI_IRQ_HANDLER on SH-Mobile.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 3dff8804fc087d55c593dda0ff78f475088ec57d
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Wed Dec 22 12:17:09 2010 +0000

    ARM: mach-shmobile: Use shared GIC entry macros
    
    Use the GIC demux code in asm/hardware/entry-macro-gic.S
    on the R-Mobile / SH-Mobile processors.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit eb6908a279dfbe2e1c1714c185e0f523a9749607
Author: Simon Horman <horms@xxxxxxxxxxxx>
Date:   Thu Dec 9 00:47:15 2010 +0000

    ARM: mach-shmobile: mackerel: Add zboot support
    
    When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
    boot loader and may be burned to rom or flash.
    
    Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
    Cc: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee
Merge: 98d27b8abf413a310df6676f7d2128ada1cccc08 
3c0cb7c31c206aaedb967e44b98442bbeb17a6c4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Jan 7 10:29:26 2011 +0900

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into 
rmobile-latest
    
    Conflicts:
        arch/arm/mach-shmobile/Kconfig
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4
Merge: f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234 
404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 16:50:35 2011 -0800

    Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
    
    * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
      ARM: DMA: add support for DMA debugging
      ARM: PL011: add DMA burst threshold support for ST variants
      ARM: PL011: Add support for transmit DMA
      ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
      ARM: PL011: Separate hardware FIFO size from TTY FIFO size
      ARM: PL011: Allow better handling of vendor data
      ARM: PL011: Ensure error flags are clear at startup
      ARM: PL011: include revision number in boot-time port printk
      ARM: vexpress: add sched_clock() for Versatile Express
      ARM i.MX53: Make MX53 EVK bootable
      ARM i.MX53: Some bug fix about MX53 MSL code
      ARM: 6607/1: sa1100: Update platform device registration
      ARM: 6606/1: sa1100: Fix platform device registration
      ARM i.MX51: rename IPU irqs
      ARM i.MX51: Add ipu clock support
      ARM: imx/mx27_3ds: Add PMIC support
      ARM: DMA: Replace page_to_dma()/dma_to_page() with 
pfn_to_dma()/dma_to_pfn()
      mx51: fix usb clock support
      MX51: Add support for usb host 2
      arch/arm/plat-mxc/ehci.c: fix errors/typos
      ...

commit f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234
Merge: b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d 
09798eb9479da3413bdf96e7d22a84d8b21e05e1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 15:30:54 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (25 
commits)
      atyfb: Fix bootup hangs on sparc64.
      sparc: update copyright in piggyback.c
      sparc: unify strip command in boot/Makefile
      sparc: rename piggyback_32 to piggyback
      sparc: fix tftpboot.img for sparc64 on little-endian host
      sparc: add $BITS to piggyback arguments
      sparc: remove obsolete ELF support in piggyback_32.c
      sparc: additional comments to piggyback_32.c
      sparc: use _start for the start entry (like 64 bit does)
      sparc: use trapbase in setup_arch
      sparc: refactor piggy_32.c
      Added support for ampopts in APBUART driver. Used in AMP systems.
      APBUART: added raw AMBA vendor/device number to match against.
      SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is 
missing
      SPARC/LEON: added support for selecting Timer Core and Timer within core
      LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
      SPARC/LEON: added support for IRQAMP IRQ Controller
      SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded.
      sparc: fix sparse warnings in arch/sparc/prom for 32 bit build
      sparc: remove unused prom tree functions
      ...

commit 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34
Merge: 28cdac6690cb113856293bf79b40de33dbd8f974 
1051b9f0f9eab8091fe3bf98320741adf36b4cfa
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 22:33:32 2011 +0000

    Merge branch 'devel-stable' into devel
    
    Conflicts:
        arch/arm/mach-pxa/clock.c
        arch/arm/mach-pxa/clock.h

commit 28cdac6690cb113856293bf79b40de33dbd8f974
Merge: 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 
36bb94ba36f332de767cfaa3af6a5136435a3a9c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 22:33:19 2011 +0000

    Merge branch 'pgt' (early part) into devel

commit 4073723acb9cdcdbe4df9c0e0c376c65d1697e43
Merge: 58daf18cdcab550262a5f4681e1f1e073e21965a 
4ec3eb13634529c0bc7466658d84d0bbe3244aea
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 22:32:52 2011 +0000

    Merge branch 'misc' into devel
    
    Conflicts:
        arch/arm/Kconfig
        arch/arm/common/Makefile
        arch/arm/kernel/Makefile
        arch/arm/kernel/smp.c

commit 4ec3eb13634529c0bc7466658d84d0bbe3244aea
Merge: 24056f525051a9e186af28904b396320e18bf9a0 
15095bb0fe779c0403091bda7adce5fb3bb9ca35
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 22:31:35 2011 +0000

    Merge branch 'smp' into misc
    
    Conflicts:
        arch/arm/kernel/entry-armv.S
        arch/arm/mm/ioremap.c

commit 24056f525051a9e186af28904b396320e18bf9a0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:29:28 2011 +0000

    ARM: DMA: add support for DMA debugging
    
    Add ARM support for the DMA debug infrastructure, which allows the
    DMA API usage to be debugged.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d
Merge: 84b7290cca16c61a167c7e1912cd84a479852165 
c6d92e9b84da2002ee7a75b784834970ddfd3bfd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 13:36:30 2011 -0800

    Merge branch 'for-linus' of 
git://codeaurora.org/quic/kernel/davidb/linux-msm
    
    * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 
commits)
      mmc: msm_sdcc: Check for only DATA_END interrupt to end a request
      mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned
      mmc: msm_sdcc: Reset SDCC in case of data transfer errors
      mmc: msm_sdcc: Add prog done interrupt support
      mmc: msm_sdcc: Fix possible circular locking dependency warning
      MSM: Add USB support for MSM7x30
      MSM: Add USB suport for QSD8x50
      msm: initial framebuffer support
      msm: add handling for clocks tagged as CLK_MINMAX
      msm: trout: change name of pmdh_clk to mddi_clk
      msm: add CLK_MINMAX to pmdh_clk
      msm: trout: add gpio_to_irq
      msm: iommu: Use the correct memory allocation flag
      msm_serial: Remove redundant unlikely()
      msm: iommu: Miscellaneous code cleanup
      msm: iommu: Support cache-coherent memory access
      msm: iommu: Definitions for extended memory attributes
      msm: iommu: Kconfig dependency for the IOMMU API
      msm: iommu: Check if device is already attached
      msm: iommu: Kconfig item for cacheable page tables
      ...

commit 84b7290cca16c61a167c7e1912cd84a479852165
Merge: 9858a38ea3a940762ae3028cce88f686d0e0c28b 
1928e87bcf185f56008d0746f887b691c1cb8c4a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 13:35:12 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (55 
commits)
      video: udlfb: Kill off special printk wrappers, use pr_fmt().
      video: udlfb: Kill off some magic constants for EDID sizing.
      video: udlfb: deifdefify (yes, that's a word).
      fbdev: modedb: Add a new mode for 864x480 TAAL panels.
      drivers/video/i810/i810-i2c.c: fix i2c bus handling
      video: Fix the HGA framebuffer driver
      drivers/video/carminefb.c: improve error handling
      video: imxfb: Fix the maximum value for yres
      fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support
      fbdev: sh_mipi_dsi: use platform provided register layout and values
      ARM: mach-shmobile: specify sh7372 MIPI DSI register layout
      fbdev: sh_mipi_dsi: support different register layouts
      ARM: mach-shmobile: improve MIPI DSI clock configuration
      fbdev: sh-mobile: implement MIPI DSI runtime PM support
      sisfb: eliminate compiler warnings
      sisfb: delete unused register I/O macros
      sisfb: replace setSISIDXREG with SiS_SetRegANDOR
      sisfb: replace andSISIDXREG with SiS_SetRegAND
      sisfb: replace orSISIDXREG with SiS_SetRegOR
      sisfb: replace outSISIDXREG with SiS_SetReg
      ...

commit 9858a38ea3a940762ae3028cce88f686d0e0c28b
Merge: abb359450f20c32ae03039d8736f12b1d561caf5 
f862f904d357dc0d3612347a8dbabe6fae037fbb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 13:34:45 2011 -0800

    Merge branch 'sh-latest' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-latest' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: include Migo-R TS driver in Migo-R defconfig
      sh: correct definitions to access stack pointers
      sh: Tidy up SH-4A unaligned load support.
      dma: shdma: NMI support.
      sh: mach-sdk7786: Handle baseboard NMI source selection.
      sh: mach-rsk: Add polled GPIO buttons support for RSK+7203.
      sh: Break out cpuinfo_op procfs bits.
      sh: Enable optional gpiolib for all CPUs with pinmux tables.
      sh: migrate SH_CLK_MD to mode pin API.
      sh: machvec IO death.

commit abb359450f20c32ae03039d8736f12b1d561caf5
Merge: cb600d2f83c854ec3d6660063e4466431999489b 
4e3dbdb1392a83bd21a6ff8f6bc785495058d37c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 12:30:19 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1436 
commits)
      cassini: Use local-mac-address prom property for Cassini MAC address
      net: remove the duplicate #ifdef __KERNEL__
      net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
      netconsole: clarify stopping message
      netconsole: don't announce stopping if nothing happened
      cnic: Fix the type field in SPQ messages
      netfilter: fix export secctx error handling
      netfilter: fix the race when initializing nf_ct_expect_hash_rnd
      ipv4: IP defragmentation must be ECN aware
      net: r6040: Return proper error for r6040_init_one
      dcb: use after free in dcb_flushapp()
      dcb: unlock on error in dcbnl_ieee_get()
      net: ixp4xx_eth: Return proper error for eth_init_one
      include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan 
local tunnel
      net: add POLLPRI to sock_def_readable()
      af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
      net_sched: pfifo_head_drop problem
      mac80211: remove stray extern
      mac80211: implement off-channel TX using hw r-o-c offload
      mac80211: implement hardware offload for remain-on-channel
      ...

commit 4e3dbdb1392a83bd21a6ff8f6bc785495058d37c
Author: Richard Mortimer <richm@xxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:50:30 2011 -0800

    cassini: Use local-mac-address prom property for Cassini MAC address
    
    Fallback on the local-mac-address prom property if the Cassini device
    does not have an address programmed in the VPD ROM. This uses the same
    technique as implemented by the sungem driver.
    
    The problem was reported by Frans van Berckel using Debian kernel 2.6.34-7
    on Sun Fire V440. udev was assigning a new eth<n> device name on each reboot
    because the cassini driver was using a random MAC address.
    
    Fix tested on 2.6.34-7 and 2.6.37 Sun Fire V440. Compile tested against
    2.6.36 davem/sparc-2.6.git
    
    Reported-by: Frans van Berckel <fberckel@xxxxxxxxx>
    Tested-by: Frans van Berckel <fberckel@xxxxxxxxx>
    Reviewed-by: Julian Calaby <julian.calaby@xxxxxxxxx>
    Reviewed-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: Richard Mortimer <richm@xxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2ad0d9d413abc3380fc1d89a9da7f8db59d9746b
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date:   Thu Jan 6 11:41:42 2011 -0800

    net: remove the duplicate #ifdef __KERNEL__
    
    Since we are already in #ifdef __KERNEL__, we don't need to check it
    again.
    
    Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 09798eb9479da3413bdf96e7d22a84d8b21e05e1
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Wed Jan 5 13:08:06 2011 -0800

    atyfb: Fix bootup hangs on sparc64.
    
    After commit 25edd6946a1d74e5e77813c2324a0908c68bcf9e ("sparc64: Get
    rid of indirect p1275 PROM call buffer.")  we can't pass virtual
    addresses >4GB to PROM calls.
    
    Largely this is never necessary in drivers because we have a copy of
    the entire PROM device tree in the kernel and a set of of_*()
    interfaces to access it.
    
    Unfortunately there were some lingering prom calls in the atyfb
    driver, in particular prom_finddevice() was being called with an
    on-stack address which could be anywhere.
    
    This code is actually probing for information we already have, the
    PROM choosen console output device is stored in of_console_device so
    all of this nasty code consolidates into a one-line comparison.
    
    Next we have some prom_getintdefault() calls which are trivially
    transformed into the equivalent of_getintprop_default().
    
    Special thanks to Fabio, who figured out exactly where the bootup
    was hanging.  That made this bug trivial to fix.
    
    Reported-by: Fabio M. Di NItto <fabbione@xxxxxxxxxxxx>
    Reported-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Reported-by: Frans van Berckel <fberckel@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Fabio M. Di NItto <fabbione@xxxxxxxxxxxx>

commit f88de8de5a8c8a8a73960d4432ceef2d38b7f86f
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date:   Sat Dec 25 03:41:30 2010 +0000

    net: bridge: check the length of skb after nf_bridge_maybe_copy_header()
    
    Since nf_bridge_maybe_copy_header() may change the length of skb,
    we should check the length of skb after it to handle the ppoe skbs.
    
    Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 38cfb907a55f3223445151b517b6e4678b8c9d66
Author: Ferenc Wagner <wferi@xxxxxxx>
Date:   Thu Jan 6 05:11:20 2011 +0000

    netconsole: clarify stopping message
    
    Signed-off-by: Ferenc Wagner <wferi@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 141dfba342b672588799432d74a3b6be88b5d713
Author: Ferenc Wagner <wferi@xxxxxxx>
Date:   Thu Jan 6 05:11:19 2011 +0000

    netconsole: don't announce stopping if nothing happened
    
    Signed-off-by: Ferenc Wagner <wferi@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 68d7c1aa2fee6acb11fcb826a207e4b81d8a1f57
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Wed Jan 5 15:14:13 2011 +0000

    cnic: Fix the type field in SPQ messages
    
    The new firmware interface requires each Slow Path Queue (SPQ) message's
    type field to include the function number.  The existing code does not
    do this consistently.  We fix this by OR'ing in the function number
    into the type field centrally in cnic_submit_kwqe_16().
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit cba85b532e4aabdb97f44c18987d45141fd93faa
Author: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date:   Thu Jan 6 11:25:00 2011 -0800

    netfilter: fix export secctx error handling
    
    In 1ae4de0cdf855305765592647025bde55e85e451, the secctx was exported
    via the /proc/net/netfilter/nf_conntrack and ctnetlink interfaces
    instead of the secmark.
    
    That patch introduced the use of security_secid_to_secctx() which may
    return a non-zero value on error.
    
    In one of my setups, I have NF_CONNTRACK_SECMARK enabled but no
    security modules. Thus, security_secid_to_secctx() returns a negative
    value that results in the breakage of the /proc and `conntrack -L'
    outputs. To fix this, we skip the inclusion of secctx if the
    aforementioned function fails.
    
    This patch also fixes the dynamic netlink message size calculation
    if security_secid_to_secctx() returns an error, since its logic is
    also wrong.
    
    This problem exists in Linux kernel >= 2.6.37.
    
    Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f682cefa5ad204d3bfaa54a58046c66d2d035ac1
Author: Changli Gao <xiaosuo@xxxxxxxxx>
Date:   Wed Jan 5 04:23:23 2011 +0000

    netfilter: fix the race when initializing nf_ct_expect_hash_rnd
    
    Since nf_ct_expect_dst_hash() may be called without nf_conntrack_lock
    locked, nf_ct_expect_hash_rnd should be initialized in the atomic way.
    
    In this patch, we use nf_conntrack_hash_rnd instead of
    nf_ct_expect_hash_rnd.
    
    Signed-off-by: Changli Gao <xiaosuo@xxxxxxxxx>
    Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 6623e3b24a5ebb07e81648c478d286a1329ab891
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Wed Jan 5 07:52:55 2011 +0000

    ipv4: IP defragmentation must be ECN aware
    
    RFC3168 (The Addition of Explicit Congestion Notification to IP)
    states :
    
    5.3.  Fragmentation
    
       ECN-capable packets MAY have the DF (Don't Fragment) bit set.
       Reassembly of a fragmented packet MUST NOT lose indications of
       congestion.  In other words, if any fragment of an IP packet to be
       reassembled has the CE codepoint set, then one of two actions MUST be
       taken:
    
          * Set the CE codepoint on the reassembled packet.  However, this
            MUST NOT occur if any of the other fragments contributing to
            this reassembly carries the Not-ECT codepoint.
    
          * The packet is dropped, instead of being reassembled, for any
            other reason.
    
    This patch implements this requirement for IPv4, choosing the first
    action :
    
    If one fragment had NO-ECT codepoint
            reassembled frame has NO-ECT
    ElIf one fragment had CE codepoint
            reassembled frame has CE
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9c86c0f4ba49b39f909d7f18731b91e563e07065
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Tue Jan 4 22:40:04 2011 +0000

    net: r6040: Return proper error for r6040_init_one
    
    Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc 
failure.
    
    Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
    Acked-by: Florian Fainelli <florian@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2a8fe003741aa90b6b9453e90af4bbb7bc42918c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Tue Jan 4 21:03:44 2011 +0000

    dcb: use after free in dcb_flushapp()
    
    The original code has a use after free bug because it's not using the
    _safe() version of the list_for_each_entry() macro.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 70bfa2d2e1bfd90ef26758b5e2749f043a940037
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Tue Jan 4 21:03:12 2011 +0000

    dcb: unlock on error in dcbnl_ieee_get()
    
    There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but
    we're holding the dcb_lock so we need to unlock first.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit cb600d2f83c854ec3d6660063e4466431999489b
Merge: 47935a731b7b850a4c6c0e55ed0741e3dd25d889 
d50d8fe192428090790e7178e9507e981e0b005b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:12:17 2011 -0800

    Merge branch 'x86-mm-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-mm-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, mm: Initialize initial_page_table before paravirt jumps

commit 0c6610017459ed9642548694fe88971d3f4206aa
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Tue Jan 4 19:24:06 2011 +0000

    net: ixp4xx_eth: Return proper error for eth_init_one
    
    Return PTR_ERR(port->phydev) instead of 1 if phy_connect failed.
    
    Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
    Acked-by: Krzysztof Halasa <khc@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 47935a731b7b850a4c6c0e55ed0741e3dd25d889
Merge: 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 
3fb82d56ad003e804923185316236f26b30dfdd5 
fd35fbcdd1b2579a6e00a1545f7124e4005d0474 
9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 
c8217b8305e5e75c23617f2f4cd262527d952c0a 
3cf9b85b474e656a0856b88290c7a289ac5ea247 
f6cd24777513fcc673d432cc29ef59881d3e4df1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:11:50 2011 -0800

    Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 
'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 
'irq-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-alternatives-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, suspend: Avoid unnecessary smp alternatives switch during 
suspend/resume
    
    * 'x86-fpu-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86-64, asm: Use fxsaveq/fxrestorq in more places
    
    * 'x86-hwmon-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, hwmon: Add core threshold notification to therm_throt.c
    
    * 'x86-paravirt-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, paravirt: Use native_halt on a halt, not native_safe_halt
    
    * 'core-locking-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      locking, lockdep: Convert sprintf_symbol to %pS
    
    * 'irq-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      irq: Better struct irqaction layout

commit 238c855805c853eaec95b0bc3065effb64f955a0
Author: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Date:   Tue Jan 4 16:07:14 2011 +0000

    include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan 
local tunnel
    
    Ethertype used by HPNA control protocols (LARQ, rate, link, etc) and by
    Broadcom wlan drivers for local signalling.
    
    Signed-off-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2
Merge: d7a5a18190d6f523b5d795bfd73f83cf13a3a383 
cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:09:57 2011 -0800

    Merge branch 'x86-uv-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-uv-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, UV, BAU: Extend for more than 16 cpus per socket
      x86, UV: Fix the effect of extra bits in the hub nodeid register
      x86, UV: Add common uv_early_read_mmr() function for reading MMRs

commit d7a5a18190d6f523b5d795bfd73f83cf13a3a383
Merge: 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e 
a8760eca6cf60ed303ad494ef45901f63165d2c8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:08:14 2011 -0800

    Merge branch 'x86-tsc-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-tsc-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Check tsc available/disabled in the delayed init function
      x86: Improve TSC calibration using a delayed workqueue
      x86: Make tsc=reliable override boot time stability checks

commit 7e12eddb73d4f288b0339ee13832a34d6bc4fd90
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date:   Thu Nov 25 17:20:20 2010 +0300

    CIFS: Simplify cifs_open code
    
    Make the code more general for use in posix and non-posix open.
    
    Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit eeb910a6d46103594eb63e6eba1aeb02022368a4
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date:   Thu Nov 25 15:12:39 2010 +0300

    CIFS: Simplify non-posix open stuff (try #2)
    
    Delete cifs_open_inode_helper and move non-posix open related things
    to cifs_nt_open function.
    
    Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit 4b886136df2b923b6fc6b2d83faa9554e84e05ab
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date:   Mon Dec 13 22:18:07 2010 +0300

    CIFS: Add match_port check during looking for an existing connection (try 
#4)
    
    If we have a share mounted by non-standard port and try to mount another 
share
    on the same host with standard port, we connect to the first share again -
    that's wrong. This patch fixes this bug.
    
    Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
    Reviewed-by: Jeff Layton <jlayton@xxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit a9f1b85e5ba80519dea6974e3574fa7a30cc5e29
Author: Pavel Shilovsky <piastryyy@xxxxxxxxx>
Date:   Mon Dec 13 19:08:35 2010 +0300

    CIFS: Simplify ipv*_connect functions into one (try #4)
    
    Make connect logic more ip-protocol independent and move RFC1001 stuff into
    a separate function. Also replace union addr in TCP_Server_Info structure
    with sockaddr_storage.
    
    Signed-off-by: Pavel Shilovsky <piastryyy@xxxxxxxxx>
    Reviewed-and-Tested-by: Jeff Layton <jlayton@xxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit df8fbc241aa3c451248b1f19fff3a3f604b107f9
Author: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
Date:   Sat Dec 11 14:19:22 2010 -0600

    cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
    
    Indicate to the server a capability of NTLM2 session security (NTLM2 Key)
    during ntlmssp protocol exchange in one of the bits of the flags field.
    If server supports this capability, send NTLM2 key even if signing is not
    required on the server.
    
    If the server requires signing, the session keys exchanged for NTLMv2
    and NTLM2 session security in auth packet of the nlmssp exchange are same.
    
    Send the same flags in authenticate message (type 3) that client sent in
    negotiate message (type 1).
    
    Remove function setup_ntlmssp_neg_req
    
    Make sure ntlmssp negotiate and authenticate messages are zero'ed
    before they are built.
    
    Reported-and-Tested-by: Robbert Kouprie <robbert@xxxxxx>
    Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
    Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit 262f86adcc0665872812a7458a5d03e19e0efe33
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Thu Nov 11 18:42:16 2010 +1100

    cifs: don't overwrite dentry name in d_revalidate
    
    Instead, use fatfs's method for dealing with negative dentries to
    preserve case, rather than overwrite dentry name in d_revalidate, which
    is a bit ugly and also gets in the way of doing lock-free path walking.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>
    Signed-off-by: Steve French <sfrench@xxxxxxxxxx>

commit 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e
Merge: b4c6e2ea5e46b03c764a918f4999a77a3149979f 
94462ad3b14739d158a1ab87bb30008c1e5a6bc1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:07:33 2011 -0800

    Merge branch 'x86-security-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-security-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      module: Move RO/NX module protection to after ftrace module update
      x86: Resume trampoline must be executable
      x86: Add RO/NX protection for loadable kernel modules
      x86: Add NX protection for kernel data
      x86: Fix improper large page preservation

commit b4c6e2ea5e46b03c764a918f4999a77a3149979f
Merge: 6f46b120a96212b85cbdcb84a64c854dfd791ede 
991cfffa7c19aa648546aff666595af896e568ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:06:31 2011 -0800

    Merge branch 'x86-platform-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-platform-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, earlyprintk: Move mrst early console to platform/ and fix a typo
      x86, apbt: Setup affinity for apb timers acting as per-cpu timer
      ce4100: Add errata fixes for UART on CE4100
      x86: platform: Move iris to x86/platform where it belongs
      x86, mrst: Check platform_device_register() return code
      x86/platform: Add Eurobraille/Iris power off support
      x86, mrst: Add explanation for using 1960 as the year offset for vrtc
      x86, mrst: Fix dependencies of "select INTEL_SCU_IPC"
      x86, mrst: The shutdown for MRST requires the SCU IPC mechanism
      x86: Ce4100: Add reboot_fixup() for CE4100
      ce4100: Add PCI register emulation for CE4100
      x86: Add CE4100 platform support
      x86: mrst: Set vRTC's IRQ to level trigger type
      x86: mrst: Add audio driver bindings
      rtc: Add drivers/rtc/rtc-mrst.c
      x86: mrst: Add vrtc driver which serves as a wall clock device
      x86: mrst: Add Moorestown specific reboot/shutdown support
      x86: mrst: Parse SFI timer table for all timer configs
      x86/mrst: Add SFI platform device parsing code

commit 6f46b120a96212b85cbdcb84a64c854dfd791ede
Merge: 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 
c7657ac0c3e4d4ab569296911164b7a2b0ff871a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:06:09 2011 -0800

    Merge branch 'x86-microcode-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-microcode-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, microcode, AMD: Cleanup code a bit
      x86, microcode, AMD: Replace vmalloc+memset with vzalloc

commit 4e1db5e58af8bc6ab4a651df279add41c48d3fc2
Merge: 37d9a8c5ea8fc063841c133fc53cc168ee620762 
eb48c9cb2053e7bb5f7f8f0371cb578a0d439450
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 11:05:21 2011 -0800

    Merge branch 'x86-mce-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-mce-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      apic, amd: Make firmware bug messages more meaningful
      mce, amd: Remove goto in threshold_create_device()
      mce, amd: Add helper functions to setup APIC
      mce, amd: Shorten local variables mci_misc_{hi,lo}
      mce, amd: Implement mce_threshold_block_init() helper function

commit 37d9a8c5ea8fc063841c133fc53cc168ee620762
Merge: 017892c341033b3e961e695bc0bf1a815efcf92e 
79250af2d5953b69380a6319b493862bf4ece972
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:56:02 2011 -0800

    Merge branch 'x86-cpu-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-cpu-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Fix included-by file reference comments
      x86, cpu: Only CPU features determine NX capabilities
      x86, cpu: Call verify_cpu during 32bit CPU startup
      x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
      x86, cpu: Rename verify_cpu_64.S to verify_cpu.S

commit 5f9251cb93237c9578160df9acc6ce9948ad8c52
Merge: 2c6607c611cb7bf0a6750bcea34a258144e302c5 
06778b1c383afbdb88ffd837e117bec06a76f450
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Thu Jan 6 10:55:42 2011 -0800

    Merge branch 'for-davem' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

commit 2c6607c611cb7bf0a6750bcea34a258144e302c5
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Thu Jan 6 10:54:29 2011 -0800

    net: add POLLPRI to sock_def_readable()
    
    Leonardo Chiquitto found poll() could block forever on tcp sockets and
    Urgent data was received, if the event flag only contains POLLPRI.
    
    He did a bisection and found commit 4938d7e0233 (poll: avoid extra
    wakeups in select/poll) was the source of the problem.
    
    Problem is TCP sockets use standard sock_def_readable() function for
    their sk_data_ready() handler, and sock_def_readable() doesnt signal
    POLLPRI.
    
    Only TCP is affected by the problem. Adding POLLPRI to the list of flags
    might trigger unnecessary schedules, but URGENT handling is such a
    seldom used feature this seems a good compromise.
    
    Thanks a lot to Leonardo for providing the bisection result and a test
    program as well.
    
    Reference : http://www.spinics.net/lists/netdev/msg151793.html
    
    Reported-and-bisected-by: Leonardo Chiquitto <leonardo.lists@xxxxxxxxx>
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Tested-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 017892c341033b3e961e695bc0bf1a815efcf92e
Merge: 42cbd8efb0746b55112de45173219f76c54390da 
cb2ded37fd2e1039f96c8c892da024a8f033add5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:51:36 2011 -0800

    Merge branch 'x86-apic-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-apic-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS 
confusion
      x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
      x86, acpi: Add MAX_LOCAL_APIC for 32bit
      x86: io_apic: Split setup_ioapic_ids_from_mpc()
      x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage
      x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()
      x86: Allow platforms to force enable apic

commit 42cbd8efb0746b55112de45173219f76c54390da
Merge: dda5f0a372873bca5f0b1d1866d7784dffd8b675 
f658bcfb2607bf0808966a69cf74135ce98e5c2d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:50:28 2011 -0800

    Merge branch 'x86-amd-nb-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-amd-nb-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, cacheinfo: Cleanup L3 cache index disable support
      x86, amd-nb: Cleanup AMD northbridge caching code
      x86, amd-nb: Complete the rename of AMD NB and related code

commit 568389c257fa7d74ce36c2f78bad31965fded4cf
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date:   Fri Dec 17 11:16:17 2010 +0100

    serial: apbuart: Fixup apbuart_console_init()
    
    commit 35c64e5d (drivers: serial: apbuart: Handle OF failures
    gracefully) missed that the modified grlib_apbuart_configure()
    function is called from apbuart_console_init() as well.
    
    Fix the fallout.
    
    Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

commit dda5f0a372873bca5f0b1d1866d7784dffd8b675
Merge: 65b2074f84be2287e020839e93b4cdaaf60eb37c 
88606e80da0e8d862a42ee19e5bb60b01b940ea7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:42:43 2011 -0800

    Merge branch 'timers-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      MAINTAINERS: Update timer related entries
      timers: Use this_cpu_read
      timerqueue: Make timerqueue_getnext() static inline
      hrtimer: fix timerqueue conversion flub
      hrtimers: Convert hrtimers to use timerlist infrastructure
      timers: Fixup allmodconfig build issue
      timers: Rename timerlist infrastructure to timerqueue
      timers: Introduce timerlist infrastructure.
      hrtimer: Remove stale comment on curr_timer
      timer: Warn when del_timer_sync() is called in hardirq context
      timer: Del_timer_sync() can be used in softirq context
      timer: Make try_to_del_timer_sync() the same on SMP and UP
      posix-timers: Annotate lock_timer()
      timer: Permit statically-declared work with deferrable timers
      time: Use ARRAY_SIZE macro in timecompare.c
      timer: Initialize the field slack of timer_list
      timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS
      time: Compensate for rounding on odd-frequency clocksources
    
    Fix up trivial conflict in MAINTAINERS

commit 65b2074f84be2287e020839e93b4cdaaf60eb37c
Merge: 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162 
6bf4123760a5aece6e4829ce90b70b6ffd751d65
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:23:33 2011 -0800

    Merge branch 'sched-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
      sched: Change wait_for_completion_*_timeout() to return a signed long
      sched, autogroup: Fix reference leak
      sched, autogroup: Fix potential access to freed memory
      sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
      sched: Fix interactivity bug by charging unaccounted run-time on entity 
re-weight
      sched: Move periodic share updates to entity_tick()
      printk: Use this_cpu_{read|write} api on printk_pending
      sched: Make pushable_tasks CONFIG_SMP dependant
      sched: Add 'autogroup' scheduling feature: automated per session task 
groups
      sched: Fix unregister_fair_sched_group()
      sched: Remove unused argument dest_cpu to migrate_task()
      mutexes, sched: Introduce arch_mutex_cpu_relax()
      sched: Add some clock info to sched_debug
      cpu: Remove incorrect BUG_ON
      cpu: Remove unused variable
      sched: Fix UP build breakage
      sched: Make task dump print all 15 chars of proc comm
      sched: Update tg->shares after cpu.shares write
      sched: Allow update_cfs_load() to update global load
      sched: Implement demand based update_cfs_load()
      ...

commit 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162
Merge: f3b0cfa9b017a9d4686c9b14b908a1685f97a077 
4b95f135f606c87e4056b6d7fd3c5781c818858b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:17:26 2011 -0800

    Merge branch 'perf-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-core-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146 commits)
      tools, perf: Documentation for the power events API
      perf: Add calls to suspend trace point
      perf script: Make some lists static
      perf script: Use the default lost event handler
      perf session: Warn about errors when processing pipe events too
      perf tools: Fix perf_event.h header usage
      perf test: Clarify some error reports in the open syscall test
      x86, NMI: Add touch_nmi_watchdog to io_check_error delay
      x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
      x86: Only call smp_processor_id in non-preempt cases
      perf timechart: Adjust perf timechart to the new power events
      perf: Clean up power events by introducing new, more generic ones
      perf: Do not export power_frequency, but power_start event
      perf test: Add test for counting open syscalls
      perf evsel: Auto allocate resources needed for some methods
      perf evsel: Use {cpu,thread}_map to shorten list of parameters
      perf tools: Refactor all_tids to hold nr and the map
      perf tools: Refactor cpumap to hold nr and the map
      perf evsel: Introduce per cpu and per thread open helpers
      perf evsel: Steal the counter reading routines from stat
      ...

commit f3b0cfa9b017a9d4686c9b14b908a1685f97a077
Merge: 2af49b6058d857fa5b476db642d4452bf5833ecd 
5bdb05f91b27b9361c4f348a4e05999f597df72e
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:07:05 2011 -0800

    Merge branch 'core-futexes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-futexes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      futex: Add futex_q static initializer
      futex: Replace fshared and clockrt with combined flags
      futex: Cleanup stale fshared flag interfaces

commit 2af49b6058d857fa5b476db642d4452bf5833ecd
Merge: b08b27213384d1bd6eda04a2b6f788b4cdee0f34 
394f4528c523d88daabd50f883a8d6b164075555
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:06:26 2011 -0800

    Merge branch 'core-rcu-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-rcu-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      rcu: remove unused __list_for_each_rcu() macro
      rculist: fix borked __list_for_each_rcu() macro
      rcu: reduce __call_rcu()-induced contention on rcu_node structures
      rcu: limit rcu_node leaf-level fanout
      rcu: fine-tune grace-period begin/end checks
      rcu: Keep gpnum and completed fields synchronized
      rcu: Stop chasing QS if another CPU did it for us
      rcu: increase synchronize_sched_expedited() batching
      rcu: Make synchronize_srcu_expedited() fast if running readers
      rcu: fix race condition in synchronize_sched_expedited()
      rcu: update documentation/comments for Lai's adoption patch
      rcu,cleanup: simplify the code when cpu is dying
      rcu,cleanup: move synchronize_sched_expedited() out of sched.c
      rcu: get rid of obsolete "classic" names in TREE_RCU tracing
      rcu: Distinguish between boosting and boosted
      rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing.
      rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU
      rcu: priority boosting for TINY_PREEMPT_RCU
      rcu: move TINY_RCU from softirq to kthread
      rcu: add priority-inversion testing to rcutorture

commit b08b27213384d1bd6eda04a2b6f788b4cdee0f34
Merge: 8484baaa5065b460e5eb18ee721d8417251f7897 
846f40455276617275284a4b76b89311b4aed0b9
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jan 6 10:01:23 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
      GFS2: Don't flush delete workqueue when releasing the transaction lock
      GFS2: fsck.gfs2 reported statfs error after gfs2_grow
      GFS2: Merge glock state fields into a bitfield
      GFS2: Fix uninitialised error value in previous patch
      GFS2: fix recursive locking during rindex truncates
      GFS2: reread rindex when necessary to grow rindex
      GFS2: Remove duplicate #defines from glock.h
      GFS2: Clean up of gdlm_lock function
      GFS2: Allow gfs2 to update quota usage values through the quotactl 
interface
      GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to 
gfs2_print_dbg
      GFS2: fs/gfs2/glock.c: Use printf extension %pV
      GFS2: Clean up duplicated setattr code
      GFS2: Remove unreachable calls to vmtruncate
      GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS
      GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM

commit 8484baaa5065b460e5eb18ee721d8417251f7897
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Wed Jan 5 16:28:43 2011 -0800

    kernel-doc: code reorganization
    
    Move 'main' code vs. subroutines around so that they are not so
    intermixed, for better readability/understanding (relative to Perl).
    It was messy to follow the primary flow of code execution with the
    code being mixed.  Now the code begins with data initialization,
    followed by all subroutines, then ends with the main code execution.
    
    This is almost totally source code movement, with a few changes as
    needed for forward declarations.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit d5ba92b7958e3ff2f0878e45b9b42cb6976853dd
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date:   Wed Jan 5 16:27:53 2011 -0800

    Documentation: update kernel-docs.txt
    
    Fixed typos, and removed duplicated entries.
    
    Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit a40649781b9c10e192fad9f00a60c6d946da553f
Author: Michael Prokop <mika@xxxxxxxx>
Date:   Wed Jan 5 16:27:15 2011 -0800

    Documentation/dontdiff: add further autogenerated files to ignore list
    
    Mainly resulting from (but not limited to) autogenerated files of
    lib/raid6 and drivers/gpu/drm/radeon. List generated as result of
    a diff of a clean 2.6.36 tree against a built one.
    
    Signed-off-by: Michael Prokop <mika@xxxxxxxx>
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Jan 6 08:16:04 2011 -0200

    [media] radio-aimslab.c: Fix gcc 4.5+ bug
    
    gcc 4.5+ doesn't properly evaluate some inlined expressions.
    A previous patch were proposed by Andrew Morton using noinline.
    However, the entire inlined function is bogus, so let's just
    remove it and be happy.
    
    Reported-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1928e87bcf185f56008d0746f887b691c1cb8c4a
Merge: ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 
3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 18:27:34 2011 +0900

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
    
    Conflicts:
        drivers/video/sh_mobile_lcdcfb.c
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit f862f904d357dc0d3612347a8dbabe6fae037fbb
Merge: 6f09e41d704fe0bc9157a5357480751d39361d01 
3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 18:24:07 2011 +0900

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
    
    Conflicts:
        arch/sh/kernel/cpu/sh2a/clock-sh7201.c
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit ca9c20ce2b383032b71bdae9ec0b468d428ca8d4
Merge: 17ca20cb7d04a259c9194879f77466bde606dda5 
81f6f3c1047392a22b9a20bbecf98c7f2d6f922a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 18:10:09 2011 +0900

    Merge branch 'fbdev/udlfb'

commit 81f6f3c1047392a22b9a20bbecf98c7f2d6f922a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 18:07:54 2011 +0900

    video: udlfb: Kill off special printk wrappers, use pr_fmt().
    
    This kills off all of the dl_xxx() printk wrappers and simply stubs in a
    pr_fmt() definition to accomplish the same thing.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit b9f03a3cd06c6f8bbecfe08eae2a69cc0a13c690
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 18:04:02 2011 +0900

    video: udlfb: Kill off some magic constants for EDID sizing.
    
    The edid length is fixed, so use the standard definition consistently.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 1a3e528cfc00a9d08114c5fa9e486a77633a425d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Thu Jan 6 17:29:24 2011 +0900

    video: udlfb: deifdefify (yes, that's a word).
    
    udlfb selects all of the options it presently ifdef conditionalizes, so
    none of the statements have any effect outside of aggravating eye strain.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 6f09e41d704fe0bc9157a5357480751d39361d01
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Thu Jan 6 05:33:15 2011 +0000

    sh: include Migo-R TS driver in Migo-R defconfig
    
    This patch enables the Migo-R specific touch screen
    driver in the Migo-R defconfig.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 17ca20cb7d04a259c9194879f77466bde606dda5
Author: Mayuresh Janorkar <mayur@xxxxxx>
Date:   Thu Jan 6 16:02:42 2011 +0900

    fbdev: modedb: Add a new mode for 864x480 TAAL panels.
    
    This adds a new entry to the modedb for 864x480 TAAL panels, the default
    configuration for many OMAP boards. This enables omapfb to make use of
    the standard mode parsing.
    
    Signed-off-by: Mayuresh Janorkar <mayur@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 748103e7235892bf9a3ee568d7d4dd7e5a3beece
Author: Stefani Seibold <stefani@xxxxxxxxxxx>
Date:   Mon Jan 3 09:28:59 2011 +0000

    drivers/video/i810/i810-i2c.c: fix i2c bus handling
    
    These patch fix a longstanding bug in the i810 frame buffer driver.
    
    The handling of the i2c bus is wrong: A 1 bit should not written to the
    i2c, these will be done by switch the i2c to input. Driving an 1 bit
    active is against the i2c spec.
    
    An active driven of a 1 bit will result in very strange error, depending
    which side is the more powerful one. In my case it depends on the
    temperature of the Display-Controller-EEprom: With an cold eprom a got
    the correct EDID datas, with a warm one some of the 1 bits was 0 :-(
    
    The same bug is also in the intelfb driver in the file
    drivers/video/intelfb/intelfb_i2c.c. The functions intelfb_gpio_setscl()
    and intelfb_gpio_setsda() do drive the 1 bit active to the i2c bus. But
    since i have no card which is used by the intelfb driver i cannot fix
    it.
    
    Signed-off-by: Stefani Seibold <stefani@xxxxxxxxxxx>
    Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
    Cc: Jean Delvare <khali@xxxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 529ed806d4540d23ca2f68b28c3715d1566fc3ac
Author: Brent Cook <busterb@xxxxxxxxx>
Date:   Fri Dec 31 05:56:50 2010 +0000

    video: Fix the HGA framebuffer driver
    
    Resurrected some old hardware and fixed up the hgafb driver to work
    again. Only tested with fbcon, since most fbdev-based software appears
    to only support 12bpp and up. It does not appear that this driver has
    worked for at least the entire 2.6.x series, perhaps since 2002.
    
    Hercules graphics hardware uses packed pixels horizontally, but rows are
    not linear. In other words, the pixels are not packed vertically. This
    means that custom imageblit, fillrect and copyarea need to be written
    specific to the hardware.
    
     * Removed the experimental acceleration option, since it is required
       for the hardware to work.
     * Fixed imageblit to work with fb_image's wider than 8 pixels.
     * Updated configuration text (HGA hardware is from 1984)
    
    Signed-off-by: Brent Cook <busterb@xxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit e045da7d835a28950543f5f10f0cb1905ca9bbaf
Author: Julia Lawall <julia@xxxxxxx>
Date:   Sun Jan 2 14:27:42 2011 +0000

    drivers/video/carminefb.c: improve error handling
    
    This code had an error handling goto to the wrong place, a misplaced
    release_mem_region, and a duplicated release_mem_region.
    
    The semantic match that finds the double release_mem_region is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @r@
    expression e1,e2,e3;
    position p1,p2,p3;
    @@
    release_mem_region@p1(e1, e2)@p3;
    ... when != request_mem_region(e1,e2,e3)
    release_mem_region(e1, e2)@p2;
    
    @@
    expression e <= r.e1,e3;
    expression r.e1,e2;
    position r.p1,r.p2,r.p3,p!=r.p1;
    @@
    *release_mem_region(e1, e2)@p3;
    ... when != e = e3
    *release_mem_region@p(e1, e2)@p2;// </smpl>
    
    Signed-off-by: Julia Lawall <julia@xxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 7ee04fd5d5ff74f81d8eee128bc9346ab87c56b8
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Fri Dec 24 12:28:24 2010 +0000

    video: imxfb: Fix the maximum value for yres
    
    MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.
    
    Fix the maximum value for yres.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 417d48274e755e537bae60461558c1f63a4e14de
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Wed Jan 5 10:21:00 2011 +0000

    fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support
    
    This patch extends the LCDC driver with 24 bpp
    and 32 bpp support.
    
    These modes have been kept disabled earlier due
    to dependencies between the potential two LCDC
    channels that are exported as two separate
    framebuffer devices. The dependency boils down
    to a byte swap register that is shared between
    multiple channels.
    
    With this patch applied all single channel LCDC
    hardware can chose freely from 16, 24 and 32 bpp.
    Dual channel LCDC must stick to the same setup
    for both channels.
    
    Without this patch only 16 bpp is fully supported.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 98d27b8abf413a310df6676f7d2128ada1cccc08
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date:   Thu Jan 6 02:44:15 2011 +0000

    ARM: mach-shmobile: mackerel: Add HDMI sound support
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 12c4309b78854ba117ea38a9178018591abd16ab
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date:   Thu Jan 6 02:44:09 2011 +0000

    ARM: mach-shmobile: mackerel: add HDMI video support
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 73674648e9bf3b0a75000b7e97edaac255cd73f7
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date:   Thu Jan 6 02:43:00 2011 +0000

    ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
    
    fsib_clk will be used when fdiv_clk failed on fsi_hdmi_set_rate.
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit b27dcfb0670ea7352a67137f4ff7947c2a9f6892
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date:   Wed Nov 17 22:56:48 2010 -0500

    [libata] avoid needlessly passing around ptr to SCSI completion func
    
    It's stored in struct scsi_cmnd->scsi_done, making several 'done'
    parameters to functions redundant.
    
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 02cdfcf043c5c6ebcbbaba1c35130b5fbcb10867
Author: David Milburn <dmilburn@xxxxxxxxxx>
Date:   Fri Nov 12 15:38:21 2010 -0600

    [libata] new driver acard_ahci, for ATP8620 host controller
    
    Add support for Acard ATP8620 host controller.
    
    Based upon initial version by Jeff Garzik.
    
    Signed-off-by: David Milburn <dmilburn@xxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 3610cda53f247e176bcbb7a7cca64bc53b12acdb
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Wed Jan 5 15:38:53 2011 -0800

    af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.
    
    unix_release() can asynchornously set socket->sk to NULL, and
    it does so without holding the unix_state_lock() on "other"
    during stream connects.
    
    However, the reverse mapping, sk->sk_socket, is only transitioned
    to NULL under the unix_state_lock().
    
    Therefore make the security hooks follow the reverse mapping instead
    of the forward mapping.
    
    Reported-by: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
    Reported-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a3c888fcda911fcb6e3c071aecf49ccb6effe79d
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 23:49:53 2011 +0100

    gen_init_cpio: checkpatch fixes
    
    Cc: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Cc: Michal Marek <mmarek@xxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 44b8288308ac9da27eab7d7bdbf1375a568805c3
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Wed Jan 5 10:35:02 2011 +0000

    net_sched: pfifo_head_drop problem
    
    commit 57dbb2d83d100ea (sched: add head drop fifo queue)
    introduced pfifo_head_drop, and broke the invariant that
    sch->bstats.bytes and sch->bstats.packets are COUNTER (increasing
    counters only)
    
    This can break estimators because est_timer() handles unsigned deltas
    only. A decreasing counter can then give a huge unsigned delta.
    
    My mid term suggestion would be to change things so that
    sch->bstats.bytes and sch->bstats.packets are incremented in dequeue()
    only, not at enqueue() time. We also could add drop_bytes/drop_packets
    and provide estimations of drop rates.
    
    It would be more sensible anyway for very low speeds, and big bursts.
    Right now, if we drop packets, they still are accounted in byte/packets
    abolute counters and rate estimators.
    
    Before this mid term change, this patch makes pfifo_head_drop behavior
    similar to other qdiscs in case of drops :
    Dont decrement sch->bstats.bytes and sch->bstats.packets
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Acked-by: Hagen Paul Pfeifer <hagen@xxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 06778b1c383afbdb88ffd837e117bec06a76f450
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Wed Dec 22 10:15:52 2010 +0100

    mac80211: remove stray extern
    
    Somehow this snuck into my earlier patch, and
    only now did I see a compiler warning:
    
    net/mac80211/led.c:218:13: warning: function 
'__ieee80211_create_tpt_led_trigger' with external linkage has definition
    
    Remove the stray extern.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 90fc4b3a5ba24f09af2a8c4a723651a328949460
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Sat Dec 18 17:20:48 2010 +0100

    mac80211: implement off-channel TX using hw r-o-c offload
    
    When the driver has remain-on-channel offload,
    implement off-channel transmission using that
    primitive.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 21f83589644bb2ed98079bf1e2154c8e70ca6a6c
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Sat Dec 18 17:20:47 2010 +0100

    mac80211: implement hardware offload for remain-on-channel
    
    This allows drivers to support remain-on-channel
    offload if they implement smarter timing or need
    to use a device implementation like iwlwifi.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit c96e96354a6c9456cdf1f150eca504e2ea35301e
Merge: dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a 
33af88138b859f515b365a074e0a014d7cdbf846
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Jan 5 16:06:25 2011 -0500

    Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into 
for-davem
    
    Conflicts:
        net/bluetooth/Makefile

commit 4b95f135f606c87e4056b6d7fd3c5781c818858b
Author: Jean Pihet <j-pihet@xxxxxx>
Date:   Wed Jan 5 19:49:02 2011 +0100

    tools, perf: Documentation for the power events API
    
    Provides documentation for the following:
    - the new power trace API,
    - the old (legacy) power trace API,
    - the DEPRECATED Kconfig option usage.
    
    Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
    Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    Cc: trenn@xxxxxxx
    Cc: Len Brown <len.brown@xxxxxxxxx>
    Cc: Pavel Machek <pavel@xxxxxx>
    Cc: Rafael J. Wysocki <rjw@xxxxxxx>
    Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
    Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Cc: linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
    LKML-Reference: <1294253342-29056-3-git-send-email-j-pihet@xxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 938cfed18bec2c7361f37efc954712a7cc42c353
Author: Jean Pihet <j-pihet@xxxxxx>
Date:   Wed Jan 5 19:49:01 2011 +0100

    perf: Add calls to suspend trace point
    
    Uses the machine_suspend trace point, called from the
    generic kernel suspend_devices_and_enter function.
    
    Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
    Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    CC: Thomas Renninger <trenn@xxxxxxx>
    Cc: Len Brown <len.brown@xxxxxxxxx>
    Cc: Pavel Machek <pavel@xxxxxx>
    Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
    Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
    LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@xxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 0eefed84fe9e1eb90f4b089ead95904306b23233
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date:   Sun Oct 31 21:23:55 2010 +0100

    m68k/sun3: Kill pte_unmap() warnings
    
    Since commit 31c911329e048b715a1dfeaaf617be9430fd7f4e ("mm: check the 
argument
    of kunmap on architectures without highmem"), we get lots of warnings like
    
    arch/m68k/kernel/sys_m68k.c:508: warning: passing argument 1 of 
â??kunmapâ?? from incompatible pointer type
    
    As m68k doesn't support highmem anyway, open code the calls to kmap() and
    kunmap() (the latter is a no-op) to kill the warnings, like is done on most
    other architectures without CONFIG_HIGHPTE.
    
    Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
    Cc: Sam Creasey <sammy@xxxxxxxxx>

commit 33af88138b859f515b365a074e0a014d7cdbf846
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Jan 5 14:05:00 2011 -0500

    ath9k: correct MODULE_PARM_DESC parameters for force_new_ani
    
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 18cb6e32e7aeea9c92af5793bee2b32536615502
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Jan 5 09:39:59 2011 -0500

    ath5k: qualify global modparam_nohwcrypt variable
    
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 3e6109c57468ed320beefd2861fe2cc418cccfc2
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Jan 5 09:39:17 2011 -0500

    ath9k: qualify global modparam_nohwcrypt variable
    
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 6303710d7aa62bfb154cd13ab5ab12cfa8baaf91
Merge: db98a6cfcc9ac951067c9a2cb60459b618fd7b10 
d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Jan 5 14:35:41 2011 -0500

    Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 58daf18cdcab550262a5f4681e1f1e073e21965a
Merge: aa312be1987d43216e72ffce42bccf6bf81f62ed 
0af85dda39d9b673aca8c0ebae004ea70f3efc93
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 18:09:03 2011 +0000

    Merge branch 'clksrc' into devel
    
    Conflicts:
        arch/arm/mach-vexpress/v2m.c
        arch/arm/plat-omap/counter_32k.c
        arch/arm/plat-versatile/Makefile

commit aa312be1987d43216e72ffce42bccf6bf81f62ed
Merge: 31edf274f9aff1ccd39934a0b2fce38f4405c656 
8c11a94d86eb5489dc665bc566bf624e329d89fa 
38d624361b2a82d6317c379aebf81b1b28210bb0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 18:08:31 2011 +0000

    Merge branches 'mmci' and 'pl011-dma' into devel

commit 31edf274f9aff1ccd39934a0b2fce38f4405c656
Merge: 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 
ed60453fa8f8fc3d034dfdf10371a99cc6905626 
ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 
28257f7fdee0facc3b7f934e82c2485f27120d41 
b23065313297e750edd57ab6edfd36224826724e 
50005a8deb38e5e6456ebd94e57adb321d4589de 
cf562b4a550b3cd9d602a05bc27aaaaa376947b4 
3d09fbcd26851ffb2c40cec411b8e56db02520d1 
8a9618f5dfca35edb0d7ab6374ff586e2e9e989b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 18:08:10 2011 +0000

    Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 
'versatile' into devel

commit 38d624361b2a82d6317c379aebf81b1b28210bb0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:59:16 2010 +0000

    ARM: PL011: add DMA burst threshold support for ST variants
    
    ST Micro variants has some specific dma burst threshold compensation,
    which allows them to make better use of a DMA controller.  Add support
    to set this up.
    
    Based on a patch from Linus Walleij.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 68b65f7305e54b822b2483c60de7d7b017526a92
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:24:39 2010 +0000

    ARM: PL011: Add support for transmit DMA
    
    Add DMA engine support for transmit to the PL011 driver.  Based on a
    patch from Linus Walliej, with the following changes:
    
    - remove RX DMA support.  As PL011 doesn't give us receive timeout
      interrupts, we only get notified of received data when the RX DMA
      has completed.  This rather sucks for interactive use of the TTY.
    
    - remove abuse of completions.  Completions are supposed to be for
      events, not to tell what condition buffers are in.  Replace it with
      a simple 'queued' bool.
    
    - fix locking - it is only safe to access the circular buffer with the
      port lock held.
    
    - only map the DMA buffer when required - if we're ever behind an IOMMU
      this helps keep IOMMU usage down, and also ensures that we're legal
      when we change the scatterlist entry length.
    
    - fix XON/XOFF sending - we must send XON/XOFF characters out as soon
      as possible - waiting for up to 4095 characters in the DMA buffer
      to be sent first is not acceptable.
    
    - fix XON/XOFF receive handling - we need to stop DMA when instructed
      to by the TTY layer, and restart it again when instructed to.  There
      is a subtle problem here: we must not completely empty the circular
      buffer with DMA, otherwise we will not be notified of XON.
    
    - change the 'enable_dma' flag into a 'using DMA' flag, and track
      whether we can use TX DMA by whether the channel pointer is non-NULL.
      This gives us more control over whether we use DMA in the driver.
    
    - we don't need to have the TX DMA buffer continually allocated for
      each port - instead, allocate it when the port starts up, and free
      it when it's shut down.  Update the 'using DMA' flag if we get
      the buffer, and adjust the TTY FIFO size appropriately.
    
    - if we're going to use PIO to send characters, use the existing IRQ
      based functionality rather than reimplementing it.  This also ensures
      we call uart_write_wakeup() at the appropriate time, otherwise we'll
      stall.
    
    - use DMA engine helper functions for type safety.
    
    - fix init when built as a module - we can't have to initcall functions,
      so we must settle on one.  This means we can eliminate the deferred
      DMA initialization.
    
    - there is no need to terminate transfers on a failed prep_slave_sg()
      call - nothing has been setup, so nothing needs to be terminated.
      This avoids a potential deadlock in the DMA engine code
      (tasklet->callback->failed prepare->terminate->tasklet_disable
       which then ends up waiting for the tasklet to finish running.)
    
    - Dan says that the submission callback should not return an error:
      | dma_submit_error() is something I should have removed after commit
      | a0587bcf "ioat1: move descriptor allocation from submit to prep" all
      | errors should be notified by prep failing to return a descriptor
      | handle.  Negative dma_cookie_t values are only returned by the
      | dma_async_memcpy* calls which translate a prep failure into -ENOMEM.
      So remove the error handling at that point.  This also solves the
      potential deadlock mentioned in the previous comment.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 963cc981af620c7c07b5f6d1ab998b639e90ecb1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:16:09 2010 +0000

    ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
    
    As the DMA support introduces a separate interrupt-time callback, our
    interrupt handler will not be the only handler which takes the port
    lock, so we need to ensure that IRQs are disabled.  We must use the
    _irqsave variant so we don't inadvertently enable interrupts.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit ffca2b114c6a804d1307781df687e877a373a1c2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:13:05 2010 +0000

    ARM: PL011: Separate hardware FIFO size from TTY FIFO size
    
    With DMA support, we need to tell the TTY subsystem that the DMA buffer
    is the size of the FIFO, otherwise things like tty_wait_until_sent()
    will time out too early.  Keep (and use) the hardware value separately
    from the port->fifosize.
    
    This was part of a larger patch from Linus Walleij, with a little
    modification.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit c19f12b5ef3adf3c139eabbe3d3d0201838b77b1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:48:26 2010 +0000

    ARM: PL011: Allow better handling of vendor data
    
    Rather than copying all vendor data into the port structure, copy
    just that which is frequently used, and keep a pointer to the
    remaining vendor data structure.  This makes it easier to add
    vendor quirks in the future.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5063e2c567ee569cccfc01ebf80c898cb4e6833a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 17:09:08 2010 +0000

    ARM: PL011: Ensure error flags are clear at startup
    
    The error flags weren't being cleared upon UART startup, which
    can cause problems when we add DMA support.  It's good practice
    to ensure that these flags are cleared anyway, so let's do so.
    
    This was part of a larger patch from Linus Walleij.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit e8a7ba86ff993311f8712e5b3bb2e3892e82df5f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 09:16:54 2010 +0000

    ARM: PL011: include revision number in boot-time port printk
    
    Include the revision number of the PL011 primecell in the boot-time
    port printk to allow proper identification of the peripheral.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit eccdfe2d245a882feacc4630c9bc29805e9929c8
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 16:32:52 2011 -0200

    perf script: Make some lists static
    
    Not accessed outside builtin-script, so make them static.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 6d8afb56300c53a250c6de0f973ef502e54aabf3
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 16:27:30 2011 -0200

    perf script: Use the default lost event handler
    
    That already does what was being done here. The warning is now 
unconditionally
    given by __perf_session__process_pipe_events, just like for non pipe 
processing.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 1109599458c06256064213dc44ca5f5fa8ee3833
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 16:25:15 2011 -0200

    perf session: Warn about errors when processing pipe events too
    
    Just like we do at __perf_session__process_events
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit d030260ad33b482a371f999c7e9db79ef7a2111f
Author: Stephane Eranian <eranian@xxxxxxxxxx>
Date:   Tue Jan 4 16:30:01 2011 +0200

    perf tools: Fix perf_event.h header usage
    
    This patch fixes the usage of the perf_event.h header file
    between command modules and the supporting code in util.
    
    It is necessary to ensure that ALL files use the SAME
    perf_event.h header from the kernel source tree.
    
    There were a couple of #include <linux/perf_event.h> mixed
    with #include "../../perf_event.h".
    
    This caused issues on some distros because of mismatch
    in the layout of struct perf_event_attr. That eventually
    led perf stat to segfault.
    
    Cc: David S. Miller <davem@xxxxxxxxxxxxx>
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Robert Richter <robert.richter@xxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxx>
    LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@xxxxxxxxxxxxx>
    Signed-off-by: Stephane Eranian <eranian@xxxxxxxxxx>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 454a3bbe9b75eb8cbddffcf383fbb8e97ea78f52
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 10:40:08 2011 -0200

    perf test: Clarify some error reports in the open syscall test
    
    Rebooted my devel machine, first thing I ran was perf test, that expects
    debugfs to be mounted, test fails. Be more clear about it.
    
    Also add missing newlines and add more informative message when
    sys_perf_event_open fails.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit a7862aa90ffd1113bc2898ae6be2e4861b1f76cc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Jan 5 12:31:15 2011 -0300

    [media] cx25821: Fix compilation breakage due to BKL dependency
    
    drivers/staging/cx25821/cx25821-video.c: In function â??video_openâ??:
    drivers/staging/cx25821/cx25821-video.c:817:8: error: implicit declaration 
of function â??lock_kernelâ??
    drivers/staging/cx25821/cx25821-video.c:834:9: error: implicit declaration 
of function â??unlock_kernelâ??
    
    This patch just adds a header with BKL function. It should be enough
    to avoid compilation breakage, but, as BKL will be removed, we need
    to properly fix it on a latter patch.
    
    Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
    Reported-by: Anca Emanuel <anca.emanuel@xxxxxxxxx>
    Cc: Palash Bandyopadhyay <Palash.Bandyopadhyay@xxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6
Author: Huang Ying <ying.huang@xxxxxxxxx>
Date:   Tue Jan 4 22:38:09 2011 -0500

    x86, NMI: Add touch_nmi_watchdog to io_check_error delay
    
    Prevent the long delay in io_check_error making NMI watchdog
    timeout.
    
    Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
    Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
    LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@xxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 554ec063982752e9a569ab9189eeffa3d96731b2
Author: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
Date:   Tue Jan 4 22:38:08 2011 -0500

    x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time
    
    The spin_lock_debug/rcu_cpu_stall detector uses
    trigger_all_cpu_backtrace() to dump cpu backtrace.
    Therefore it is possible that trigger_all_cpu_backtrace()
    could be called at the same time on different CPUs, which
    triggers and 'unknown reason NMI' warning. The following case
    illustrates the problem:
    
          CPU1                    CPU2                     ...   CPU N
                           trigger_all_cpu_backtrace()
                           set "backtrace_mask" to cpu mask
                                   |
    generate NMI interrupts  generate NMI interrupts       ...
        \                          |                               /
         \                         |                              /
    
    The "backtrace_mask" will be cleaned by the first NMI interrupt
    at nmi_watchdog_tick(), then the following NMI interrupts
    generated by other cpus's arch_trigger_all_cpu_backtrace() will
    be taken as unknown reason NMI interrupts.
    
    This patch uses a test_and_set to avoid the problem, and stop
    the arch_trigger_all_cpu_backtrace() from calling to avoid
    dumping a double cpu backtrace info when there is already a
    trigger_all_cpu_backtrace() in progress.
    
    Signed-off-by: Dongdong Deng <dongdong.deng@xxxxxxxxxxxxx>
    Reviewed-by: Bruce Ashfield <bruce.ashfield@xxxxxxxxxxxxx>
    Cc: fweisbec@xxxxxxxxx
    LKML-Reference: <1294198689-15447-2-git-send-email-dzickus@xxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
    Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>

commit 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date:   Tue Jan 4 22:38:07 2011 -0500

    x86: Only call smp_processor_id in non-preempt cases
    
    There are some paths that walk the die_chain with preemption on.
    Make sure we are in an NMI call before we start doing anything.
    
    This was triggered by do_general_protection calling notify_die
    with DIE_GPF.
    
    Reported-by: Jan Kiszka <jan.kiszka@xxxxxx>
    Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
    LKML-Reference: <1294198689-15447-1-git-send-email-dzickus@xxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit aef1b9cef78ae65c6501850851cc3f61f9be477b
Merge: 20c457b8587bee4644d998331d9e13be82e05b4c 
3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Jan 5 14:22:08 2011 +0100

    Merge commit 'v2.6.37' into perf/core
    
    Merge reason: Add the final .37 tree.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 6bf4123760a5aece6e4829ce90b70b6ffd751d65
Author: NeilBrown <neilb@xxxxxxx>
Date:   Wed Jan 5 12:50:16 2011 +1100

    sched: Change wait_for_completion_*_timeout() to return a signed long
    
    wait_for_completion_*_timeout() can return:
    
       0: if the wait timed out
     -ve: if the wait was interrupted
     +ve: if the completion was completed.
    
    As they currently return an 'unsigned long', the last two cases
    are not easily distinguished which can easily result in buggy
    code, as is the case for the recently added
    wait_for_completion_interruptible_timeout() call in
    net/sunrpc/cache.c
    
    So change them both to return 'long'.  As MAX_SCHEDULE_TIMEOUT
    is LONG_MAX, a large +ve return value should never overflow.
    
    Signed-off-by: NeilBrown <neilb@xxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: J.  Bruce Fields <bfields@xxxxxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
    LKML-Reference: <20110105125016.64ccab0e@xxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 27066fd484a32c80630136aa2b91c980f3198f9d
Merge: 101e5f77bf35679809586e250b6c62193d2ed179 
3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Jan 5 14:14:42 2011 +0100

    Merge commit 'v2.6.37' into sched/core
    
    Merge reason: Merge the final .37 tree.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit cb2ded37fd2e1039f96c8c892da024a8f033add5
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date:   Tue Jan 4 16:38:52 2011 -0800

    x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion
    
    Found one x2apic pre-enabled system, x2apic_mode suddenly get
    corrupted after register some cpus, when compiled
    CONFIG_NR_CPUS=255 instead of 512.
    
    It turns out that generic_processor_info() ==> phyid_set(apicid,
    phys_cpu_present_map) causes the problem.
    
    phys_cpu_present_map is sized by MAX_APICS bits, and pre-enabled
    system some cpus have an apic id > 255.
    
    The variable after phys_cpu_present_map may get corrupted
    silently:
    
     ffffffff828e8420 B phys_cpu_present_map
     ffffffff828e8440 B apic_verbosity
     ffffffff828e8444 B local_apic_timer_c2_ok
     ffffffff828e8448 B disable_apic
     ffffffff828e844c B x2apic_mode
     ffffffff828e8450 B x2apic_disabled
     ffffffff828e8454 B num_processors
     ...
    
    Actually phys_cpu_present_map is referenced via apic id, instead
    index. We should use MAX_LOCAL_APIC instead MAX_APICS.
    
    For 64-bit it will be 32768 in all cases. BSS will increase by 4k bytes
    on 64-bit:
    
        text            data            bss             dec             filename
        21696943        4193748         12787712        38678403        
vmlinux.before
        21696943        4193748         12791808        38682499        
vmlinux.after
    
    No change on 32bit.
    
    Finally we can remove MAX_APCIS that was rather confusing.
    
    Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
    Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
    Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
    LKML-Reference: <4D23BD9C.3070102@xxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 8e1023016cf17152972b98bce6c144834a4916d5
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:18 2011 +0100

    [S390] prevent unneccesary loops_per_jiffy recalculation
    
    When the seqfile /proc/cpuinfo gets accesses for each possible cpu
    loops_per_jiffy gets recalculated. However its value is only needed
    on first access.
    In addition loops_per_jiffy should be recalculated when the machine
    reports a capability change.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 19726cec63aeadad127f9e72ee69240336e37f15
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:17 2011 +0100

    [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
    
    Use get_online_cpus() instead of preempt_disable() to make sure cpus
    don't go offline while accessing their per cpu data.
    The preempt_disable() stuff is old code which was used before
    get_online_cpus() was available.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 974de4d7e70a6d759457722a6f322cc86b480eea
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:16 2011 +0100

    [S390] smp: remove cpu hotplug messages
    
    Get rid of messages that indicate if a cpu went online or offline.
    There is nothing special about this anymore and these messages might
    flood the kernel log buffer which makes debugging harder since more
    important messages might be overwritten.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit fa188ae1657d6edc7963d524ce9a0650fe725242
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:15 2011 +0100

    [S390] mutex: enable spinning mutex on s390
    
    This enables the spinning mutex feature on s390 by removing
    HAVE_DEFAULT_NO_SPIN_MUTEXES from arch/s390/Kconfig.
    
    Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 34b133f8e94e39ff3cf4d1c1f67f2e07cdc3d54e
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:14 2011 +0100

    [S390] mutex: Introduce arch_mutex_cpu_relax()
    
    The spinning mutex implementation uses cpu_relax() in busy loops as a
    compiler barrier. Depending on the architecture, cpu_relax() may do more
    than needed in this specific mutex spin loops. On System z we also give
    up the time slice of the virtual cpu in cpu_relax(), which prevents
    effective spinning on the mutex.
    
    This patch replaces cpu_relax() in the spinning mutex code with
    arch_mutex_cpu_relax(), which can be defined by each architecture that
    selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so
    this patch should not affect other architectures than System z for now.
    
    Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <1290437256.7455.4.camel@thinkpad>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit c03017544e3b2e60aa3c8ae451fac01595f1bf11
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:13 2011 +0100

    [S390] cio: fix ccwgroup unregistration race condition
    
    A race condition exists in the ccwgroup device unregistration code
    which can cause a kernel panic due to a use-after-free bug. This
    race condition might be triggered when all ccw devices associated with
    a ccwgroup device are removed at the same time (e.g. because the
    corresponding channel path becomes no longer available).
    
    Fix this race condition by clearing the references from the associated
    ccw devices to the ccw group device during unregistration of the
    ccw group device.
    
    Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit f602be639e97024a77062368e123008c94b3109a
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:12 2011 +0100

    [S390] perf: add DWARF register lookup for s390
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 4cc9bed034d1ae588e5b773ee0edeb74ef3c0ff4
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:11 2011 +0100

    [S390] cleanup ftrace backend functions
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 5e9a26928f550157563cfc06ce12c4ae121a02ec
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:10 2011 +0100

    [S390] ptrace cleanup
    
    Overhaul program event recording and the code dealing with the ptrace
    user space interface.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit da7f51c11d5fedca9ba779ee220063ccb4f0a27e
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:09 2011 +0100

    [S390] smp/idle: call init_idle() before starting a new cpu
    
    Call init_idle() which (re-)initializes the idle task structure before
    it gets used on a new cpu.
    That way we can also get rid of the odd preempt_enable_no_resched()
    call we have in the cpu offline path within cpu_idle(). That call
    prevented preempt count imbalances between cpu hotplug operations.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit f230886b0b0f0ce604395481bea05f3c0ad8fc9e
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:08 2011 +0100

    [S390] smp: delay idle task creation
    
    Delay idle task creation until a cpu gets set online instead of
    creating them for all possible cpus at system startup.
    For one cpu system this should safe more than 1 MB.
    On my debug system with lots of debug stuff enabled this saves 2 MB.
    
    Same as on x86.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 09a8e7adcf960bd6a7204f3f3b377a89ce22efbf
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:07 2011 +0100

    [S390] dasd: Correct retry counter for terminated I/O.
    
    In case the DASD driver needs to term a running I/O the retry counter
    is decreased twice.
    Remove the unnecessary retry counter decrease in das_term_IO.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit e4dbb0f2b5dd6a836d0e5c60aa5f573e0bbcf76a
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:06 2011 +0100

    [S390] dasd: Add support for raw ECKD access.
    
    Normal I/O operations through the DASD device driver give only access
    to the data fields of an ECKD device even for track based I/O.
    This patch extends the DASD device driver to give access to whole
    ECKD tracks including count, key and data fields.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 6f272b9cec285a9610a2acf101f694bc58bed37e
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:05 2011 +0100

    [S390] dasd: Prevent deadlock during suspend/resume.
    
    The freeze callback may set a stop bit so that a worker thread could
    not start I/O. The discipline specific freeze function waits for the
    worker to be completed.
    Set the stop_bit after the discipline specific freeze function has
    returned and no worker is running.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 5a27e60dec59a95bd7f8ae9a19ae2ede4f76395b
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:04 2011 +0100

    [S390] dasd: Improve handling of stolen DASD reservation
    
    If a DASD device has been reserved by a Linux system, and later
    this reservation is â??stolenâ?? by a second system by means of an
    unconditional reserve, then the first system receives a
    notification about this fact. With this patch such an event can
    be either ignored, as before, or it can be used to let the device
    fail all I/O request, so that the device will not block anymore.
    
    Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit a4d26c6aeceea330ee5e0fb6b017d57e3b252d29
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:03 2011 +0100

    [S390] dasd: do path verification for paths added at runtime
    
    When a new path is added at runtime, the CIO layer will call the drivers
    path_event callback. The DASD device driver uses this callback to trigger
    a path verification for the new path. The driver will use only those
    paths for I/O, which have been successfully verified.
    
    Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit ef19298b406f93af4bb249f0776deb8366e97532
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:02 2011 +0100

    [S390] dasd: add High Performance FICON multitrack support
    
    Some storage systems support multitrack High Performance FICON
    requests, which read or write data to more than one track.
    This patch enables the DASD device driver to generate multitrack
    High Performance FICON requests.
    
    Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 9062014cb60194630272709da82d5879d563865e
Author: Stefan Weinhuber <wein@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:01 2011 +0100

    [S390] cio: reduce memory consumption of itcw structures
    
    Any list of indirect data adresses (TIDAL) used by a TCW must not
    cross a page boundary. The original itcw implementation complies with
    this restriction by allocating allmost twice as much memory as
    actually needed, so that in any case there is enough room for the full
    TIDAL, either above or below the page boundary.
    This patch implements an alternative method, by using a TTIC TIDAW to
    connect TIDAL parts below and above a page boundary.
    
    Signed-off-by: Stefan Weinhuber <wein@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit f3e1a273594c7d82b07102bd03e8adfe681f2864
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:48:00 2011 +0100

    [S390] nmi: enable machine checks early
    
    Until now machine checks for the swapper process of the IPL cpu are just
    implicitly (and more or less accidently) enabled when the first time the
    idle process goes into idle state and loads an enabled wait psw.
    Before that machine checks are disabled.
    So let's enable them explicitly in trap_init() so we have a well defined
    time when machine checks are enabled.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit aa3a41d009d433dd9775b356b2d70551816f1f3c
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:59 2011 +0100

    [S390] qeth: buffer count imbalance
    
    The used buffers counter is not incremented in case of an error so
    the counter can become negative. Increment the used buffers counter
    before checking for errors.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 4bc4e965d3e86897e4c7c487a477ccdf13db5b82
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:58 2011 +0100

    [S390] css: update subchannel descriptor
    
    Update the subchannel descriptor if we receive a
    "Installed parameters modified" crw.
    
    Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 1de3447a41ea72972966b4896a9f8d2b064bd23f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:57 2011 +0100

    [S390] 31 bit entry.S update.
    
    Make the code in the 31 bit entry.S code as similar as possible to the
    64 bit version in entry64.S. That makes it easier to add new code to
    the first level interrupt handler that affects both 31 and 64 bit kernels.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit ce322ccd53f2505cf8b0ed204631d6ac054ac66a
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:56 2011 +0100

    [S390] cio: obtain mdc value per channel path
    
    Add support to accumulate the number of 64K-bytes blocks all paths
    to a device at least support for a transport command.
    
    Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 37e8952174c6c239d1c86125e032fd6ad107a3e6
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:55 2011 +0100

    [S390] nohz: optimize arch_needs_cpu()
    
    arch_needs_cpu() gets always executed on the current cpu. Therefore
    the cpu parameter can be ignored it is possible to use __get_cpu_var()
    instead of per_cpu() to access the per_cpu variable, which will
    generate better code.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 90adac58d1a4daf3560739ff5b76497d5ece16c4
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:54 2011 +0100

    [S390] qdio: cleanup SIGA sync
    
    Simplify the SIGA sync code and add unlikely annotations. In polling mode
    SBALs may be accessed without interrupt, so call SIGA sync before every 
scan.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 110da31709023de61735f2d8a3e52c20c23bb570
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:53 2011 +0100

    [S390] qdio: remove enhanced SIGA
    
    HiperSocket devices only use one SBAL per qdio call without the enhanced 
SIGA
    feature. Since that feature is currently not used remove it from the qdio 
code
    so the compiler can generate better code for the HiperSocket outbound path.
    While at it mark the SIGA error conditions as unlikely.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 958c0ba403cb6a693b54be2389f9ef53377fa259
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:52 2011 +0100

    [S390] qdio: use proper QEBSM operand for SIGA-R and SIGA-S
    
    If QIOASSIST is enabled for a qdio device the SIGA instruction requires
    a modified function code. This function code modifier was missing for
    SIGA-R and SIGA-S which can lead to a kernel panic caused by an
    operand exception.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 0195843bfda90a215f3b72c9aac2fd0bc9244b67
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:51 2011 +0100

    [S390] qdio: outbound queue full counter
    
    Add a counter for outbound queue full events to the qdio statistics.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 3d6c76ff32bb9b2ebf6e859855d315eb42e3df50
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:50 2011 +0100

    [S390] qdio: outbound tasklet scan threshold
    
    Introduce a scan treshold for the qdio outbound queues. By setting the
    threshold the driver can tell qdio after how much used SBALs qdio
    should schedule the outbound tasklet that scans the queue for finished
    SBALs. The threshold is specific by the drivers because a
    Hipersockets device is much faster in utilizing outbound buffers than a
    ZFCP or OSA device.
    
    The default values after how many used SBALs the tasklet should run are:
    
    OSA:          > 31 SBALs
    Hipersockets: > 7 SBALs
    zfcp:         > 55 SBALs
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 4f325184f2d4c1f2258873b2a333005dc4dfcbc0
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:49 2011 +0100

    [S390] qdio: prevent race for shared indicators
    
    If the shared indicator is used the following race leads to
    an inbound stall:
    
    Device                  CPU0                    CPU1
    ========================================================
    
    non-shared DSCI =>1
    ALSI => 1
                            Thin INT
                            ALSI => 0
    
                            non-shared DSCI
                            tasklets scheduled
    
    shared DSCI => 1
    ALSI => 1
    
                            shared DSCI => 0
                            ALSI ? -> set
                                                    Thin INT
                                                    ALSI => 0
                            ALSI was set,
                            shared DSCI => 1
    
    After that no more interrupts occur because the DSCI is still set.
    Fix that race by only resetting the shared DSCI if it was actually
    set so the tasklets for all shared devices are scheduled and will
    run after the interrupt.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 078f8ecaa30718694d1e13d9f415b7ce75b3c968
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:48 2011 +0100

    [S390] Handling of 4096 bit RSA keys in CRT format.
    
    Also process 4096 bit RSA keys in CRT format. Handle them like the
    smaller keys and take care of the zero padding.
    
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit c2567f8ffa2704f6f2f81013e9a590deca5a865f
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:47 2011 +0100

    [S390] zcrypt: cope with cca restriction of cex3
    
    The cca on the crypto adapter has a restriction in the size of the
    exponent if a key with a modulus bigger than 2048 bit is used. Thus
    in that case we have to avoid that the crypto device driver thinks
    the adapter is defect and sets it offline. Therfore a new member for
    the zcrypt_device struct called max_exp_bit_length is introduced. This
    will be set the first time the cca returns the error code function
    not implemented. If this is done with an adapter twice it will return
    -EINVAL.
    
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 2ade1fab026b4a103f0105ec4b47654fc2f729c7
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:46 2011 +0100

    [S390] zcrypt: support for 4096 bit keys for cex3c
    
    Definitions for CEX3 card types are changed to support 4096 bit RSA
    keys in the coprocessor.
    
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 3e309a66f52e042881f76cbfb9b6c2aa70163e02
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:45 2011 +0100

    [S390] zcrypt: support for 4096 bit keys for cex3a
    
    Definitions for CEX3 card types are changed to support 4096 bit RSA
    keys. Also new structs for the accelerator mode are needed.
    Additionaly when checking the length of key parts, the case for bigger
    (4096 bit) keys is needed.
    
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit b1f933da570576d1f290ea4dc9b896404cbd285d
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:44 2011 +0100

    [S390] zcrypt: Introduce check for 4096 bit support.
    
    Implemented an asm in the ap bus and made it accessible for the card
    specific parts of the zcrypt driver. Thus when a cex3a is recognized
    a check can be performed to dermine whether the card supports 4096 bit
    RSA keys.
    
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 2fcb3686e1601cff992e026dceeab1b22dc81178
Author: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:43 2011 +0100

    [S390] hypfs: Move buffer allocation from open to read
    
    Currently the buffer for diagnose data is allocated in the open function
    of the debugfs file and is released in the close function. This has the
    drawback that a user (root) can pin that memory by not closing the file.
    This patch moves the buffer allocation to the read function. The buffer is
    automatically released after the buffer is copied to userspace.
    
    Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 6432c015b754fef910dd7468b16fffc2b975348a
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:42 2011 +0100

    [S390] current_thread_info optimization
    
    Use thread_info lowcore field for current_thread_info(), saves
    an unnecessary calculation.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit b1b750918566c6c4e8ed6c9b3c0f05b4c0a8805c
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:41 2011 +0100

    [S390] extint: get rid of early code plus cleanup
    
    Get rid of register/unregister_early_external_interrupt() and clean up
    the code while at it.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 98b799800c3e2f855ef2d2c6263e84fa5d1420a0
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:40 2011 +0100

    [S390] sclp: use register_external_interrupt()
    
    Use register_external_interrupt() instead of 
register_early_external_interrupt().
    The early variant is not necessary since kmalloc works already.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit fb0a9d7e865afdae70829a64bb004a74ff67d29f
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:39 2011 +0100

    [S390] pfault: delay register of pfault interrupt
    
    Use an early init call to initialize pfault. That way it is possible to
    use the register_external_interrupt() instead of the early variant.
    No need to enable pfault any earlier since it has only effect if user
    space processes are running.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 62d146ffe3adfed2747fc36138476c8417ce73a7
Author: Holger Dengler <hd@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:38 2011 +0100

    [S390] ap bus: add support for irq statistics
    
    Add support for AP Bus I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Holger Dengler <hd@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 85b81cdd0b038d580dedf6289df7de65826967d6
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:37 2011 +0100

    [S390] ctc: add support for irq statistics
    
    Add support for CTC I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 355eb4022b92349f70cd69ce5b9572c71c0be226
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:36 2011 +0100

    [S390] claw: add support for irq statistics
    
    Add support for CLAW I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 096a61682e86090e4e74118ff6fa6858ca73aa58
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:35 2011 +0100

    [S390] lcs: add support for irq statistics
    
    Add support for LCS I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit f48198d592b0d680b9677bd69edd2290cd0c1f4f
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:34 2011 +0100

    [S390] vmur: add support for irq statistics
    
    Add support for VMUR I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit b86651721f18f40319efe94ed3eac2d26682e5b9
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:33 2011 +0100

    [S390] tape: add support for irq statistics
    
    Add support for ccw based tape I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 3fe22f6bfd6f81aafd140d69578d3a2c39674664
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:32 2011 +0100

    [S390] 3270: add support for irq statistics
    
    Add support for 3270 I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 12fae5858cd97181c92472c9bb5f098a7eca2ffe
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:31 2011 +0100

    [S390] 3215: add support for irq statistics
    
    Add support for 3215 I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 3283942b71eb5023184b378230f5f0e3fbb40991
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:30 2011 +0100

    [S390] dasd: add support for irq statistics
    
    Add support for DASD I/O interrupt statistics in /proc/interrupts.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 30d77c3e1cbdff304b16ae02cb56baaa308e42fd
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 12:47:29 2011 +0100

    [S390] qdio: add qdio interrupts to interrupt statistics
    
    Count traditional qdio interrupts and adapter interrupts for qdio
    in the interrupt statistics.
    
    Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 052ff461c8427629aee887ccc27478fc7373237c
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:28 2011 +0100

    [S390] irq: have detailed statistics for interrupt types
    
    Up to now /proc/interrupts only has statistics for external and i/o
    interrupts but doesn't split up them any further.
    This patch adds a line for every single interrupt source so that it
    is possible to easier tell what the machine is/was doing.
    Part of the output now looks like this;
    
               CPU0       CPU2       CPU4
    EXT:       3898       4232       2305
    I/O:        782        315        245
    CLK:       1029       1964        727   [EXT] Clock Comparator
    IPI:       2868       2267       1577   [EXT] Signal Processor
    TMR:          0          0          0   [EXT] CPU Timer
    TAL:          0          0          0   [EXT] Timing Alert
    PFL:          0          0          0   [EXT] Pseudo Page Fault
    [...]
    NMI:          0          1          1   [NMI] Machine Checks
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 545b288dcbdea58a2ce2afba5f6a8302d31ac459
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:27 2011 +0100

    [S390] time: let local_tick_enable/disable() reprogram the clock comparator
    
    Let local_tick_enable/disable() reprogram the clock comparator so the
    function names make semantically more sense.
    Also that way the functions are more symmetric since normally each
    local_tick_enable() call usually would have a subsequent call to
    set_clock_comparator() anyway.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 17eb7a5cfa98627e5b34e9a9a33b4f04f1c8832d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:26 2011 +0100

    [S390] time: move local_tick_enable()/disable() to timex.h
    
    Move the two functions to timex.h where they make more sense than in
    hardirq.h.
    No functional change.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 860dba45e81be2e1ba977617652ae36084daebaf
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:25 2011 +0100

    [S390] add kprobes annotations
    
    Add kprobes annotations to get the massive 'probe kernel.function("*") {}'
    stress test working.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 4a1886358b2d68f6f8745bfc10399c2376681acc
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:24 2011 +0100

    [S390] kprobes: coding style
    
    Correct some minor coding style issues.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 0e917cc3297f3274993d25b5972c2b1c6f763819
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:23 2011 +0100

    [S390] kprobes: restructure handler function
    
    Restructure the kprobe breakpoint handler function. Add comments to
    make it more comprehensible and add a sanity check for re-entering
    kprobes.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 92b8cbf17ae98a118d3e4a123246a05130114d06
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:22 2011 +0100

    [S390] kprobes: jprobe save and restore
    
    Register %r14 and %r15 are already stored in jprobe_saved_regs, no need
    to store them a second time in jprobe_saved_r14 / jprobe_saved_r15.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 371db06b017c518da2d69ae278c5978ebcd1041a
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:21 2011 +0100

    [S390] kprobes: insn slots
    
    The s390 architecture can execute code on kmalloc/vmalloc memory.
    No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit b9599798f953084774da926caa8bafd7e244948e
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:20 2011 +0100

    [S390] kprobes: activation and deactivation
    
    Replace set_current_kprobe/reset_current_kprobe/save_previous_kprobe/
    restore_previous_kprobe with a simpler scheme push_kprobe/pop_kprobe.
    The mini kprobes stack can store up to two active kprobes.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit ba640a591574036ab22cd32b47897340b0605342
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:19 2011 +0100

    [S390] kprobes: instruction fixup
    
    Determine instruction fixup details in resume_execution, no need to do
    it beforehand. Remove fixup, ilen and reg from arch_specific_insn.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 5a8b589f8a35b2c69d1819e3365825e4385a844c
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:18 2011 +0100

    [S390] kprobes: instruction swap
    
    Move the definition of the helper structure ins_replace_args to the
    only place where it is used and drop the old member as it is not needed.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit fc0a1fea6b81095b6c0e01ec3407d04c8341974c
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:17 2011 +0100

    [S390] kprobes: single step cleanup
    
    The saved interrupt mask and the saved control registers are only
    relevant while single stepping is set up. A secondary kprobe while
    kprobe single stepping is active may not occur. That makes is safe
    to remove the save and restore of kprobe_saved_imask / kprobe_save_ctl
    from save_previous_kprobe and restore_previous_kprobe.
    Move all single step related code to two functions, enable_singlestep
    and disable_singlestep.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 35f2aaa79a2d484c8449f34461464a1e84e36e2b
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:16 2011 +0100

    [S390] kprobes: single stepped breakpoint
    
    Remove special case of a kprobe on a breakpoint while a relocated
    instruction is single stepped. The only instruction that may cause
    a fault while kprobe single stepping is active is the relocated
    instruction. There is no kprobe on the instruction slot retrieved
    with get_insn_slot().
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 6f9a3c330652b0fdb65d89e94977a8e79fe730e7
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date:   Wed Jan 5 12:47:15 2011 +0100

    [S390] cleanup s390 Kconfig
    
    Make use of def_bool and def_tristate where possible and add sensible
    defaults to the config symbols where applicable. This shortens the
    defconfig file by another ~40 lines.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 53ec24b1e6c7118a127cf029a1519a2ce55268ec
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date:   Wed Jan 5 12:46:44 2011 +0100

    [S390] zcrypt: Fix check to look for facility bits 2 & 65
    
    Fix the check for ap interupts to look for facility bits 2 and 65.
    Make sure that we only register interrupts for aps, if the machine
    has ap interrupt support.
    
    This patch is relevant only for the 2.6.37 stable series.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
    Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>

commit 0af85dda39d9b673aca8c0ebae004ea70f3efc93
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:58:50 2010 +0000

    ARM: vexpress: add sched_clock() for Versatile Express
    
    Add a sched_clock() implementation to Versatile Express using the new
    sched_clock() infrastructure for extending 32bit counters to full
    64-bit nanoseconds.
    
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 1051b9f0f9eab8091fe3bf98320741adf36b4cfa
Merge: cde9efef401563943d5a58eb9b7274bfdc08ca9b 
a58154d1c3535f451a409abbd0bda6770b2d9380
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Jan 5 10:23:38 2011 +0000

    Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into 
devel-stable

commit d3a23e1678a5827c38ed8a465ad91d65e59fa911
Author: Nick Piggin <npiggin@xxxxxxxxx>
Date:   Wed Jan 5 20:01:21 2011 +1100

    Revert "fs: use RCU read side protection in d_validate"
    
    This reverts commit 3825bdb7ed920845961f32f364454bee5f469abb.
    
    You cannot dget() a dentry without having a reference, or holding
    a lock that guarantees it remains valid.
    
    Signed-off-by: Nick Piggin <npiggin@xxxxxxxxx>

commit 97cbc8fb1e35e328073e84c4031bd338306397d6
Merge: 17d6ce11195fceda62af00beefde37e37a01337c 
14bbb7c61557172e4482d4d97a5f56042a12b969
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Wed Jan 5 17:30:20 2011 +0900

    Merge branch 'common/fbdev-mipi' of 
master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

commit 025a10a76808cfd9e55dbf965d0f1453e4f8ae84
Merge: 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8 
f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b 
c070c203cde0e019cd373d3247137be11961deb3 
d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Wed Jan 5 17:25:29 2011 +0900

    Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into 
rmobile-latest
    
    Conflicts:
        arch/arm/mach-shmobile/Kconfig
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 14bbb7c61557172e4482d4d97a5f56042a12b969
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Wed Dec 29 08:12:29 2010 +0000

    fbdev: sh_mipi_dsi: use platform provided register layout and values
    
    Different sh-mobile SoCs have variations in their MIPI DSI register layouts,
    besides, different LCD panels require different configuration parameters. 
This
    patch switches the driver to use platform-provided MIPI DSI parameters.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 6fd465956e287f2bff8ff70ad4f27825dc3b468c
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Wed Dec 29 08:12:26 2010 +0000

    ARM: mach-shmobile: specify sh7372 MIPI DSI register layout
    
    Prepare the ap4evb board for the MIPI DSI driver transition to support
    
    different register layouts.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 38f3a8794236af422312d280bbe3801130cfa63b
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Wed Dec 29 08:12:22 2010 +0000

    fbdev: sh_mipi_dsi: support different register layouts
    
    The register layout of the MIPI DSI unit on sh-mobile SoCs differ. Add 
platform
    parameters to support such variations.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 0851d50dc12a844778a9b243e141f713cd8f074f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Mon Dec 27 10:23:09 2010 +0000

    ARM: mach-shmobile: improve MIPI DSI clock configuration
    
    Now, that the MIPI DSI driver implements runtime PM, we don't need anymore 
to
    configure clocks statically in the platform code. This patch also adds a 
DSITX1
    clock definition for sh7372 and attaches PHY clocks to respective devices.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 236782a5f3674d06865d822092b8a1ea65a44f96
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Mon Dec 27 10:23:05 2010 +0000

    fbdev: sh-mobile: implement MIPI DSI runtime PM support
    
    On SH-Mobile platforms using runtime PM with the MIPI DSI driver switches 
the
    DSI Tx link clock on PM events.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit c070c203cde0e019cd373d3247137be11961deb3
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date:   Wed Dec 22 14:15:08 2010 +0000

    ARM: mach-shmobile: sh73a0: fix div4 table
    
    sh73a0 has divisor[12] setting as 1/7 on FRQCRA.
    
    Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date:   Tue Dec 28 05:54:53 2010 +0000

    ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit ae37c8de74734f640f757be64ddb85f19f042626
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Wed Dec 22 14:47:40 2010 +0000

    ARM: mach-shmobile: Mackerel VGA camera support
    
    Add VGA camera support to the Mackerel board
    using soc_camera_platform.
    
    The VGA camera module is hooked up using the
    8-bit CEU bus, and it is constantly bursting
    out frames in fixed video mode setting. The
    camera module does not allow any I2C control.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit eac676e531214f1e276645613acae7d7c4529035
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date:   Sat Jan 1 18:36:36 2011 +0000

    sh: correct definitions to access stack pointers
    
    A definition like:
    
    #define regs_return_value(regs)     ((regs)->regs[0])
    
    called with regs_return_value(foo) will be preprocessed to:
    
    ((foo)->foo[0])
            ^^^
    So to fix this to ensure the preprocessor compiles such calls correctly.
    
    Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Wed Dec 29 07:59:25 2010 +0000

    mmc: sh_mmcif: make DMA support by the driver unconditional
    
    Simplify the driver by removing the possibility to build it without the DMA
    support and remove the respective Kconfig parameter.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Acked-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 050855887236701c5e7ff803b42265824ce99885
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:19 2011 +0000

    sparc: update copyright in piggyback.c
    
    Update copyright info in piggyback.c to include
    info from piggyback_64.c.
    Include my own copyright too.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Cc: Josip Rodin <joy@xxxxxxxxxxxxxx>
    Cc: Jakub Jelinek <jakub@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9202db2202288f0013c3285b291d8281a8190962
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:18 2011 +0000

    sparc: unify strip command in boot/Makefile
    
    Include an additional "Kernel is ready" print for zImage
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 56818a6f9105ac016ecf5907f7cb63bcdab639fe
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:17 2011 +0000

    sparc: rename piggyback_32 to piggyback
    
    Now that we use the same piggyback for 32 and 64 bit
    we can drop the _32 suffix.
    Include some trivial unification in the Makefile
    now that 32 and 64 bit can share the same piggyback command.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 1075c4ef707ca83afbeb0950094436eb0245ec86
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:16 2011 +0000

    sparc: fix tftpboot.img for sparc64 on little-endian host
    
    piggyback_32 adapted to support sparc64:
    - locating "HdrS" differs for sparc and sparc64
    - sparc64 updates a_text, a_data + a_bss in the final a.out header
    
    Updated Makefile to use piggyback_32 for sparc64.
    Deleted the now unused piggyback_64.c
    
    piggyback_32.c is host endian neutral and works on both
    little-endian and big-endian hosts.
    This fixes a long standing bug where sparc64 could not
    generate tftpboot.img on a x86 host.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a020bb17b7046cd97ea6924ca99325b6e516bc2d
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:15 2011 +0000

    sparc: add $BITS to piggyback arguments
    
    Add new option to piggyback that identify if this is
    for 32 or 64 bit.
    Use this information to determine the alignment used.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 571e08f6e2ddd6ec5d547358f55342726c063072
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:14 2011 +0000

    sparc: remove obsolete ELF support in piggyback_32.c
    
    As we always convert to a.out there is no need to
    support ELF.
    
    Removing ELF support because:
    - it is not used
    - it simplifies code to support a.out only
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9c239053045568abf960b01e4eb2c7205e3cd7d6
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:13 2011 +0000

    sparc: additional comments to piggyback_32.c
    
    While reverse engineering the functionality of piggyback
    I missed that the code was actually commented.
    So I added a few comments.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit b2a39b0d8ec2ce2bdcff4e01572b4e885220254d
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:12 2011 +0000

    sparc: use _start for the start entry (like 64 bit does)
    
    We use "_start" in 64 bit - do the same in 32 bit.
    It is always good to be consistent.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e405ae76af19cd2c85335b842f880a2bc98ba785
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:11 2011 +0000

    sparc: use trapbase in setup_arch
    
    start and trapbase point to the same address.
    But using start to assing to sparc_ttable looked confusing.
    
    Replace this with the use of trapbase.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2fe74fa9662f8df51e6ef18227089f54cc07e16a
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Tue Jan 4 11:39:10 2011 +0000

    sparc: refactor piggy_32.c
    
    Refactoring to increase readability (a little).
    - sort includes
    - spaces around operators
    - small helpers introduced
    - added a few comments
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Jan 4 16:50:19 2011 -0800

    Linux 2.6.37

commit 65f42886e24be2197b1263f138eabf40c6774d00
Merge: 8a87694ed159d7abd2c9ed657416696c05db2252 
9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Jan 4 13:55:49 2011 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      ipv4/route.c: respect prefsrc for local routes
      bridge: stp: ensure mac header is set
      bridge: fix br_multicast_ipv6_rcv for paged skbs
      atl1: fix oops when changing tx/rx ring params
      drivers/atm/atmtcp.c: add missing atm_dev_put
      starfire: Fix dma_addr_t size test for MIPS
      tg3: fix return value check in tg3_read_vpd()
      Broadcom CNIC core network driver: fix mem leak on allocation failures in 
cnic_alloc_uio_rings()
      ISDN, Gigaset: Fix memory leak in do_disconnect_req()
      CAN: Use inode instead of kernel address for /proc file
      skfp: testing the wrong variable in skfp_driver_init()
      ppp: allow disabling multilink protocol ID compression
      ehea: Avoid changing vlan flags
      ueagle-atm: fix PHY signal initialization race

commit dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a
Merge: 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 
9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Tue Jan 4 11:57:25 2011 -0800

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

commit db98a6cfcc9ac951067c9a2cb60459b618fd7b10
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date:   Mon Jan 3 12:03:44 2011 -0800

    libertas: down_interruptible() can return -EINTR, not EINTR
    
    Fix test in lbs_spi_thread().  down_interruptible() can return -EINTR, but
    not EINTR.
    
    Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
    Cc: Dan Williams <dcbw@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit b5c34f662a3519d34f9634a14d8de638fdbe0ca3
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Mon Jan 3 19:51:09 2011 +0100

    mac80211: fix some key comments and code
    
    The key documentation is slightly out of date, fix
    that. Also, the list entry in the key struct is no
    longer used that way, so list_del_init() isn't
    necessary any more there.
    
    Finally, ieee80211_key_link() is no longer invoked
    under RCU read lock, but rather with an appropriate
    station lock held.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit cc72128750700d01c31f583a355c5f8f809498bb
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Mon Jan 3 21:22:18 2011 +0530

    ath9k_htc: Fix packet injection
    
    To inject a packet in monitor mode, a dummy station has
    to be associated with the monitor interface in the target.
    Failing to do this would result in a firmware crash on the device.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit a8851d10aadb46b25db4459aa0d1150c957d2bc1
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Mon Jan 3 08:46:29 2011 +0300

    ath5k: ath5k_eeprom_mode_from_channel() returns signed
    
    ath5k_eeprom_mode_from_channel() returns -1 on error but we're storing
    the result in "ee_mode" which is an unsigned char.  This breaks the
    error handling.  This patch makes "ee_mode" an int.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 2ae79d52cdac733037490486792a53de9fb8d6b6
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date:   Fri Dec 31 20:49:00 2010 +0530

    ath9k : few rate control clean ups
    
    Remove some obvious looking dead code and rename few functions
    
    Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 707e634326448190bfe2d937c44ec05c8dea63c4
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Thu Dec 30 17:29:53 2010 +0100

    Revert "mac80211: temporarily disable reorder release timer"
    
    This reverts enables the reorder release timer once again.
    
    The issues laid out in:
    <http://www.spinics.net/lists/linux-wireless/msg57214.html>
    
    Have been addressed by:
        mac80211: serialize rx path workers
        mac80211: ignore PSM bit of reordered frames
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 24a8fdad35835e8d71f7c4b978a246fafed2e7b4
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Thu Dec 30 17:25:29 2010 +0100

    mac80211: serialize rx path workers
    
    This patch addresses the issue of serialization between
    the main rx path and various reorder release timers.
    
    <http://www.spinics.net/lists/linux-wireless/msg57214.html>
    
    It converts the previously local "frames" queue into
    a global rx queue [rx_skb_queue]. This way, everyone
    (be it the main rx-path or some reorder release timeout)
    can add frames to it.
    
    Only one active rx handler worker [ieee80211_rx_handlers]
    is needed. All other threads which have lost the race of
    "runnning_rx_handler" can now simply "return", knowing that
    the thread who had the "edge" will also take care of their
    workload.
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 1186488b4a4d4871e40cb1604ba3ede3d4b7cc90
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date:   Thu Dec 30 19:07:44 2010 +0530

    ath9k: fix beacon restart on channel change
    
    Restart the beacon timers only if the beacon
    was already configured. Otherwise beacons timers
    are restarted unnecessarily in unassociated state too.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit bd8027a72a1af95efd1dc8ea6df2fd9724c885b2
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date:   Thu Dec 30 12:18:01 2010 +0530

    Revert "ath9k: Parse DTIM period from mac80211"
    
    This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008.
    
    Event though with the above commit we obtain the configured DTIM period
    from the AP rather than always hardcoding it to '1', this seems to cause
    problems under the following scenarios:
    * Preventing association with broken AP's
    * Adds latency in roaming
    So its better to always use the safe value of '1' for dtim period
    
    Cc: Jouni Malinen <Jouni.Malinen@xxxxxxxxxxx>
    Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ff039c6fb372c87a3cc4fd25bb846790cb35edb8
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date:   Wed Dec 29 17:09:02 2010 -0500

    cfg80211: fix transposition of words in printk
    
    Fixes the misplaced article in the following:
    
    "cfg80211: Updating information on frequency 5785 MHz for
        20 a MHz width channel with regulatory rule:"
    
    Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit f76b57b47e5fd423f9827c7b0ba7bbd06cca6b9b
Author: Joel A Fernandes <agnel.joel@xxxxxxxxx>
Date:   Tue Dec 28 19:28:11 2010 -0600

    mac80211: Fix mesh portal communication with other mesh nodes.
    
    Fixed a bug where if a mesh interface has a different MAC address from its 
bridge
    interface, then it would not be able to send data traffic to any other mesh 
node.
    This also adds support for communication between mesh nodes and external 
bridged
    nodes by using a 6 address format if the source is a node within the mesh 
and the
    destination is an external node proxied by a mesh portal.
    
    Signed-off-by: Joel A Fernandes <agnel.joel@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 1c30cc19081c16b1fe73ac13f2cb2abc009cdcc4
Author: Felix Fietkau <nbd@xxxxxxxxxxx>
Date:   Tue Dec 28 15:46:16 2010 +0100

    ath9k_hw: fix dma descriptor rx error bit parsing
    
    An Rx DMA descriptor can have multiple error bits set, and some error
    bits (e.g. MIC failure) are filtered by the driver based on other criteria.
    Remove the 'else' in various error bit checks so that all error information
    is properly passed to the driver.
    
    Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 1e1f4ad25fab29ca48b1166e74a81e9c89ddf0fb
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Tue Dec 28 14:28:52 2010 +0530

    ath9k_htc: Move LED/RFKILL code to htc_drv_gpio.c
    
    And add the copyright/license header.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 039a07215e0fca00c450f4bf1dc9b458bdfe8559
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Tue Dec 28 14:28:37 2010 +0530

    ath9k_htc: Fix fast channel change
    
    When returning to the operating channel, a full HW
    reset has to be done instead of a fast channel change.
    Since sw_scan_complete() is called after the config() call for the
    home channel, we end up doing a FCC. Fix this issue by checking
    the OFFCHANNEL flag to determine FCC.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 73908674c6957082e8ab57daed57d2bb97a1ebba
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Tue Dec 28 14:28:27 2010 +0530

    ath9k_htc: Handle FATAL events
    
    The device has to be reset when a FATAL event is received.
    Not doing so would leave the card in a non-working state.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 66e3547431a8738416b508badfb9f326d11dabcc
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Tue Dec 28 14:28:14 2010 +0530

    ath9k_htc: Move work cancellation outside of mutex
    
    There is no need to lock the various work cancellation
    calls. This will be helpful when handling FATAL events.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ff8f59b5bbdf1527235b8c88d859c7d23691324f
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Tue Dec 28 14:28:05 2010 +0530

    ath9k_htc: Handle pending URBs properly
    
    When doing a channel change, the pending URBs have to be killed
    properly on calling htc_stop().
    
    This fixes the probe response timeout seen when sending UDP traffic at
    a high rate and running background scan at the same time.
    
    Cc: stable <stable@xxxxxxxxxx>
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ee832d3e9e72abf83931205a2f5379944be501c2
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date:   Tue Dec 28 13:06:26 2010 +0530

    ath9k: Few clean ups in beacon config parameters
    
    Some minor clean ups in assigning values to beacon config parameters
    
    Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 4cfda47b69d0a37e5fc0292addba6d0f5f671a14
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Mon Dec 27 23:21:26 2010 +0100

    mac80211: ignore PSM bit of reordered frames
    
    This patch tackles one of the problems of my
    reorder release timer patch from August.
    
    <http://www.spinics.net/lists/linux-wireless/msg57214.html>
    =>
    What if the reorder release triggers and ap_sta_ps_end
    (called by ieee80211_rx_h_sta_process) accidentally clears
    the WLAN_STA_PS_STA flag, because 100ms ago - when the STA
    was still active - frames were put into the reorder buffer.
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 5af3c1d195a6169a925a929e800dc4fce2a545ae
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date:   Mon Dec 27 15:07:35 2010 +0100

    rt2x00: Fix comment about removed spinlock
    
    The comment doesn't match the code anymore. Fix that.
    
    Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
    Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 48103d25c4ca00a1d0692895f9aa68fcac6bc6af
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date:   Mon Dec 27 15:07:16 2010 +0100

    rt2x00: Remove unused interface spinlock
    
    Since the last user of intf->lock is gone we can safely remove it.
    
    Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
    Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit bfe6a15d60671993eb3d4ac396b1f442ae08581c
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date:   Mon Dec 27 15:06:57 2010 +0100

    rt2x00: Simplify intf->delayed_flags locking
    
    Instead of protecting delayed_flags with a spinlock use atomic bitops to
    make the code more readable.
    
    Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
    Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit f833eea0a77b0910ea202468175bfc80470d44d0
Author: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
Date:   Mon Dec 27 15:06:36 2010 +0100

    rt2x00: Remove superfluous assignment of mpdu_density
    
    The tx desciptor already gets initialized to 0. Hence, there's no need
    to explicitly assign 0 to mpdu_density here.
    
    Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 11f16aefcc07178972f149f1a1d53e6868481394
Author: Ismael Luceno <ismael.luceno@xxxxxxxxx>
Date:   Mon Dec 27 15:06:17 2010 +0100

    rt2x00: Fix panic on frame padding for rt2800 usb devices
    
    Backtrace:
      rt2800usb_write_tx_data
      rt2x00queue_write_tx_frame
      rt2x00mac_tx
      invoke_tx_handlers
      __ieee80211_tx
      ieee80211_tx
      virt_to_head_page
      ieee80211_xmit
      ieee80211_tx_skb
      ieee80211_scan_work
      schedule
      ieee80211_scan_work
      process_one_work
      ...
    
    It tried to expand the skb past it's end using skb_put. So I replaced it
    with a call to skb_padto, which takes the issue into account.
    
    Signed-off-by: Ismael Luceno <ismael.luceno@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 736e3acadce8438e610b897af2b1c472ed58444b
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date:   Mon Dec 27 15:05:55 2010 +0100

    rt2x00: Fix pointer errors.
    
    Fix some pointer errors in the various calls to memcpy, memset and memmove.
    
    Although none of these errors are fatal (the expression used now results in
    the same pointer value) it is better to use the proper expression.
    All errors are having to deal with arrays.
    
    Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit a39fd6be19bde021314262a6d2193b3792c808db
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date:   Mon Dec 27 15:05:35 2010 +0100

    rt2x00: remove intf->mac field.
    
    The mac field of the rt2x00_intf structure is written to once and used
    twice. In both these uses the mac address is available via other means.
    
    Remove this field as it does not appear to be necessary.
    
    Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f
Author: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
Date:   Mon Dec 27 15:05:14 2010 +0100

    rt2x00: Remove intf->bssid field.
    
    The bssid field in struct rt2x00_intf is only written to once, and is
    never read from.
    
    Remove this field, as it appears to not be needed.
    
    Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 5235189c8edddf2eb32982f814bc858b55e6350a
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date:   Mon Dec 27 15:04:54 2010 +0100

    rt2x00: allow txstatus_fifo w/o txstatus_tasklet
    
    When DRIVER_REQUIRE_TXSTATUS_FIFO is set, intialize the
    txstatus_fifo, but initialize rt2x00dev->txstatus_tasklet
    only when both DRIVER_REQUIRE_TXSTATUS_FIFO and
    rt2x00dev->ops->lib->txstatus_tasklet are set.
    
    This allows the txstatus_fifo to be used by rt2800usb which
    does not use txstatus_tasklet.
    
    Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit c4d63244218bf93d1f0cdf4389e0906df8f506c1
Author: Johannes Stezenbach <js@xxxxxxxxx>
Date:   Mon Dec 27 15:04:29 2010 +0100

    rt2x00: simplify txstatus_fifo handling
    
    Signed-off-by: Johannes Stezenbach <js@xxxxxxxxx>
    Signed-off-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 97e2c40269e168df986daf94af1c62e07d4fc599
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Sun Dec 26 18:22:29 2010 +0100

    carl9170: fix usb pm suspend->resume woes
    
    This patch revamps some common code-paths which are
    shared between (re-)initialization and suspend/resume
    subroutines. It also adds some helpful comments
    about quirks and associated difficulties.
    
    It's quite big, but it should fix #25382:
    <https://bugzilla.kernel.org/show_bug.cgi?id=25382>
    
    And hopefully the code is robust enough to deal with
    all possible suspend/resume scenarios without requiring
    the user to do any sort of manual and possibly
    dangerous work.
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Sun Dec 26 18:22:16 2010 +0100

    carl9170: reduce channel change delay
    
    By removing two "safety" msleeps (and an echo nop), the
    channel change delay is effectively halved. Previously,
    the delay could be as long as 260 ms and the device
    could not go off-channel without risking to miss the
    next DTIM beacon [interval ~307 ms].
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 9fc3bbb4a752f108cf096d96640f3b548bbbce6c
Author: Joel Sing <jsing@xxxxxxxxxx>
Date:   Mon Jan 3 20:24:20 2011 +0000

    ipv4/route.c: respect prefsrc for local routes
    
    The preferred source address is currently ignored for local routes,
    which results in all local connections having a src address that is the
    same as the local dst address. Fix this by respecting the preferred source
    address when it is provided for local routes.
    
    This bug can be demonstrated as follows:
    
     # ifconfig dummy0 192.168.0.1
     # ip route show table local | grep local.*dummy0
     local 192.168.0.1 dev dummy0  proto kernel  scope host  src 192.168.0.1
     # ip route change table local local 192.168.0.1 dev dummy0 \
         proto kernel scope host src 127.0.0.1
     # ip route show table local | grep local.*dummy0
     local 192.168.0.1 dev dummy0  proto kernel  scope host  src 127.0.0.1
    
    We now establish a local connection and verify the source IP
    address selection:
    
     # nc -l 192.168.0.1 3128 &
     # nc 192.168.0.1 3128 &
     # netstat -ant | grep 192.168.0.1:3128.*EST
     tcp        0      0 192.168.0.1:3128        192.168.0.1:33228 ESTABLISHED
     tcp        0      0 192.168.0.1:33228       192.168.0.1:3128  ESTABLISHED
    
    Signed-off-by: Joel Sing <jsing@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit c9e57f0fdccf74ef7884fed61d212e524b9c4bcd
Author: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
Date:   Sun Dec 26 18:21:53 2010 +0100

    carl9170: add missing return-value check
    
    This patch adds a forgotten bail-out path.
    
    Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit bb007554fe1f66c4796c7c7ae7bfc735fc8213f7
Author: Bob Copeland <me@xxxxxxxxxxxxxxx>
Date:   Sun Dec 26 12:10:05 2010 -0500

    ath5k: fix cycle counter inconsistent locking
    
    ath5k_reset is called from process context and takes the cc_lock
    with plain spin_lock(), but cc_lock can also be taken from tasklets
    in softirq context.  Thus we need to at least use spin_lock_bh.
    
    This fixes the following lockdep warning:
    
    [   19.967874] sky2 0000:01:00.0: eth0: enabling interface
    [   19.982761] ieee80211 phy0: device now idle
    [   20.904809] NET: Registered protocol family 17
    [   21.243857] ieee80211 phy0: device no longer idle - scanning
    [   21.404343]
    [   21.404346] =================================
    [   21.404450] [ INFO: inconsistent lock state ]
    [   21.404518] 2.6.37-rc7-wl+ #242
    [   21.404582] ---------------------------------
    [   21.404650] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
    [   21.404721] kworker/u:4/982 [HC0[0]:SC1[3]:HE1:SE0] takes:
    [   21.404792]  (&(&common->cc_lock)->rlock){+.?...}, at: [<f8115780>] 
ath5k_ani_calibration+0x29/0x5d9 [ath5k]
    [   21.405011] {SOFTIRQ-ON-W} state was registered at:
    [   21.405011]   [<c105cadd>] __lock_acquire+0x62f/0x13c1
    [   21.405011]   [<c105d944>] lock_acquire+0xd5/0xf1
    [   21.405011]   [<c12c978d>] _raw_spin_lock+0x45/0x72
    [   21.405011]   [<f8111533>] ath5k_reset+0x2c0/0x349 [ath5k]
    [   21.405011]   [<f8111a7a>] ath5k_start+0xb8/0x139 [ath5k]
    [   21.405011]   [<f849c714>] ieee80211_do_open+0x13f/0x819 [mac80211]
    [   21.405011]   [<f849ce51>] ieee80211_open+0x63/0x66 [mac80211]
    [   21.405011]   [<c1258b2e>] __dev_open+0x8d/0xb6
    [   21.405011]   [<c1255c64>] __dev_change_flags+0x9d/0x114
    [   21.405011]   [<c1258a75>] dev_change_flags+0x18/0x44
    [   21.405011]   [<c1262990>] do_setlink+0x23f/0x521
    [   21.405011]   [<c1262d58>] rtnl_setlink+0xe6/0xea
    [   21.405011]   [<c126347c>] rtnetlink_rcv_msg+0x18a/0x1a0
    [   21.405011]   [<c126d5f0>] netlink_rcv_skb+0x35/0x7b
    [   21.405011]   [<c12632eb>] rtnetlink_rcv+0x20/0x27
    [   21.405011]   [<c126d370>] netlink_unicast+0x1bb/0x21e
    [   21.405011]   [<c126db21>] netlink_sendmsg+0x23b/0x288
    [   21.405011]   [<c124823c>] sock_sendmsg+0xac/0xc4
    [   21.405011]   [<c1248680>] sys_sendmsg+0x152/0x1a2
    [   21.405011]   [<c1249b0d>] sys_socketcall+0x214/0x275
    [   21.405011]   [<c10029d0>] sysenter_do_call+0x12/0x36
    [   21.405011] irq event stamp: 138032
    [   21.405011] hardirqs last  enabled at (138032): [<c12ca252>] 
_raw_spin_unlock_irqrestore+0x3b/0x5e
    [   21.405011] hardirqs last disabled at (138031): [<c12c98cc>] 
_raw_spin_lock_irqsave+0x18/0x7e
    [   21.405011] softirqs last  enabled at (138024): [<f84a570e>] 
ieee80211_tx_skb+0x47/0x49 [mac80211]
    [   21.405011] softirqs last disabled at (138027): [<c100452b>] 
do_softirq+0x63/0xb4
    [   21.405011]
    [   21.405011] other info that might help us debug this:
    [   21.405011] 3 locks held by kworker/u:4/982:
    [   21.405011]  #0:  (name){+.+.+.}, at: [<c1046158>] 
process_one_work+0x1b8/0x41b
    [   21.405011]  #1:  ((&(&local->scan_work)->work)){+.+.+.}, at: 
[<c1046158>] process_one_work+0x1b8/0x41b
    [   21.405011]  #2:  (&local->mtx){+.+.+.}, at: [<f84920fb>] 
ieee80211_scan_work+0x32/0x4a4 [mac80211]
    [   21.405011]
    [   21.405011] stack backtrace:
    [   21.405011] Pid: 982, comm: kworker/u:4 Not tainted 2.6.37-rc7-wl+ #242
    [   21.405011] Call Trace:
    [   21.405011]  [<c12c6e68>] ? printk+0x1d/0x25
    [   21.405011]  [<c105a742>] print_usage_bug+0x181/0x18b
    [   21.405011]  [<c105b196>] ? check_usage_forwards+0x0/0xb6
    [   21.405011]  [<c105a9ec>] mark_lock+0x2a0/0x4aa
    [   21.405011]  [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd
    [   21.405011]  [<c105ca68>] __lock_acquire+0x5ba/0x13c1
    [   21.405011]  [<c1059eed>] ? trace_hardirqs_off_caller+0x18/0x8d
    [   21.405011]  [<c1059f6d>] ? trace_hardirqs_off+0xb/0xd
    [   21.405011]  [<c1050411>] ? local_clock+0x2c/0x4f
    [   21.405011]  [<c1059e00>] ? save_trace+0x2/0xa0
    [   21.405011]  [<c105ac39>] ? mark_held_locks+0x43/0x5b
    [   21.405011]  [<c12ca252>] ? _raw_spin_unlock_irqrestore+0x3b/0x5e
    [   21.405011]  [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
    [   21.405011]  [<c105d944>] lock_acquire+0xd5/0xf1
    [   21.405011]  [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
    [   21.405011]  [<c12c9b1a>] _raw_spin_lock_bh+0x4a/0x77
    [   21.405011]  [<f8115780>] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k]
    [   21.405011]  [<f8115780>] ath5k_ani_calibration+0x29/0x5d9 [ath5k]
    [   21.405011]  [<c105ac39>] ? mark_held_locks+0x43/0x5b
    [   21.405011]  [<f8113496>] ath5k_tasklet_ani+0x1d/0x27 [ath5k]
    [   21.405011]  [<c1037304>] tasklet_action+0x96/0x137
    [   21.405011]  [<c10379b5>] __do_softirq+0xde/0x1c3
    [   21.405011]  [<c10b0cef>] ? arch_get_unmapped_area_topdown+0x3b/0x127
    [   21.405011]  [<c10378d7>] ? __do_softirq+0x0/0x1c3
    [   21.405011]  <IRQ>  [<c1036dee>] ? irq_exit+0x3d/0x49
    [   21.405011]  [<c1003b4f>] ? do_IRQ+0x98/0xac
    [   21.405011]  [<c1002eee>] ? common_interrupt+0x2e/0x34
    [   21.405011]  [<c103007b>] ? sys_unshare+0x57/0x226
    [   21.405011]  [<c1047fee>] ? queue_delayed_work+0x1/0x27
    [   21.405011]  [<f84a83a0>] ? ieee80211_queue_delayed_work+0x2e/0x33 
[mac80211]
    [   21.405011]  [<f8492528>] ? ieee80211_scan_work+0x45f/0x4a4 [mac80211]
    [   21.405011]  [<c104620e>] ? process_one_work+0x26e/0x41b
    [   21.405011]  [<c1046158>] ? process_one_work+0x1b8/0x41b
    [   21.405011]  [<f84920c9>] ? ieee80211_scan_work+0x0/0x4a4 [mac80211]
    [   21.405011]  [<c10466b6>] ? worker_thread+0x18a/0x2a5
    [   21.405011]  [<c12ca25e>] ? _raw_spin_unlock_irqrestore+0x47/0x5e
    [   21.405011]  [<c104652c>] ? worker_thread+0x0/0x2a5
    [   21.405011]  [<c104abe7>] ? kthread+0x67/0x6c
    [   21.405011]  [<c104ab80>] ? kthread+0x0/0x6c
    [   21.405011]  [<c1002efa>] ? kernel_thread_helper+0x6/0x10
    
    Signed-off-by: Bob Copeland <me@xxxxxxxxxxxxxxx>
    Acked-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 44cefead807daf96d0f43eb494b1eb5edb5454bf
Author: Brian Prodoehl <bprodoehl@xxxxxxxxx>
Date:   Sat Dec 25 14:34:43 2010 -0500

    ath9k: fix spur mitigation no-spur case for AR9002
    
    For the AR9002, the spur frequency read from the EEPROM is mangled
    before being compared against AR_NO_SPUR.  This results in the driver
    trying to set up the spur mitigation for bogus spurs, rather than
    cleanly breaking out.
    
    Signed-off-by: Brian Prodoehl <bprodoehl@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ad9082adfc0a6bdcef1bad2f22485575479d7a9d
Author: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Date:   Sat Dec 25 15:03:58 2010 +0900

    airo: use simple_write_to_buffer
    
    Simplify write file operation for /proc files by using
    simple_write_to_buffer().
    
    Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
    Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
    Cc: linux-wireless@xxxxxxxxxxxxxxx
    Cc: netdev@xxxxxxxxxxxxxxx
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 52671e43dbfb0e0dfa5fab604cb3984bd1d777a6
Author: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
Date:   Thu Dec 23 21:06:57 2010 +0530

    ath9k: spin_lock_bh is not required within tasklet context.
    
    Disabling BH is not required while running from a tasklet context
    and so replace spin_lock_bh with just spin_lock.
    
    Signed-off-by: Senthil Balasubramanian <senthilkumar@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit cd017f25e391dfabaca185bb4a5aefd02fd6c0ca
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date:   Thu Dec 23 15:12:30 2010 +0100

    iwlagn: fix scan tx antenna setting on 5Ghz band
    
    Looks that we do not set correctly antennas when scanning
    on 5Ghz band and when bluetooth is enabled, because
    priv->cfg->scan_tx_antennas[band] is only defined for
    IEEE80211_BAND_2GHZ.
    
    To fix we check band before limiting antennas to first one.
    This allow to remove hard coded cfg->scan_tx_antennas[band].
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
    Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit cd2c5486526b744fb505e18c9d981b35feaf283a
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Wed Dec 22 19:20:32 2010 +0900

    ath5k: Move mac80211 functions into new file
    
    Move mac80211 functions into new file mac80211-ops.c to have a better
    separation and to make base.c smaller.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48
Author: Francois-Xavier Le Bail <fx.lebail@xxxxxxxxx>
Date:   Tue Jan 4 09:10:20 2011 +0000

    net: typos in comments in include/linux/igmp.h
    
    There are typos in comments in include/linux/igmp.h:
    
    83 #define IGMP_HOST_MEMBERSHIP_QUERY      0x11    /* From RFC1112 */
    84 #define IGMP_HOST_MEMBERSHIP_REPORT     0x12    /* Ditto */
    [snip]
    88 #define IGMPV2_HOST_MEMBERSHIP_REPORT   0x16    /* V2 version of 0x11 */
    89 #define IGMP_HOST_LEAVE_MESSAGE         0x17
    90 #define IGMPV3_HOST_MEMBERSHIP_REPORT   0x22    /* V3 version of 0x11 */
    
    The line 88 and 90 are about REPORT messages.
    The IGMP_HOST_MEMBERSHIP_REPORT (IGMP V1) value is 0x12.
    So the comment on line 88 must be /* V2 version of 0x12 */,
    and the comment on line 90 must be /* V3 version of 0x12 */.
    
    Signed-off-by: Francois-Xavier Le Bail <fx.lebail@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0511af9e9a43c64dd7e23e642c9087710688768c
Merge: 782a9e31e81956a271375c0ba8d46fbb0480983e 
003ea98195eebdfcf476317b517e8c29a25b9d10
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Tue Jan 4 14:26:34 2011 -0500

    Merge branch 'wireless-next-2.6' of 
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6

commit 782a9e31e81956a271375c0ba8d46fbb0480983e
Merge: 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a 
17f9cc3124c97f50a19a7597e5f29f915b5b835c
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Tue Jan 4 14:25:28 2011 -0500

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6

commit d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Mon Jan 3 19:42:24 2011 +0100

    mac80211: add missing synchronize_rcu
    
    commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2
    Author: Johannes Berg <johannes.berg@xxxxxxxxx>
    Date:   Tue Jun 1 10:19:19 2010 +0200
    
        mac80211: simplify key locking
    
    removed the synchronization against RCU and thus
    opened a race window where we can use a key for
    TX while it is already freed. Put a synchronisation
    into the right place to close that window.
    
    Reported-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Cc: stable@xxxxxxxxxx [2.6.36+]
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 919bbad580445801c22ef6ccbe624551fee652bd
Author: Milton Miller <miltonm@xxxxxxx>
Date:   Thu Dec 30 02:01:03 2010 -0600

    mac80211: fix mesh forwarding when ratelimited too
    
    Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said:
    
        Under memory pressure, the mac80211 mesh code
        may helpfully print a message that it failed
        to clone a mesh frame and then will proceed
        to crash trying to use it anyway. Fix that.
    
    Avoid the reference whenever the frame copy is unsuccessful
    regardless of the debug message being suppressed or printed.
    
    Cc: stable@xxxxxxxxxx [2.6.27+]
    Signed-off-by: Milton Miller <miltonm@xxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit f28f3313aa97dcb46954f90f596d75f8faf4626e
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:35 2011 +0000

    Added support for ampopts in APBUART driver. Used in AMP systems.
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit d89ddf0da8f0a140d4dc2e2dbc594fb278e33db5
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:34 2011 +0000

    APBUART: added raw AMBA vendor/device number to match against.
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9663eb21fcfeb1ed9afd73d14bbc4198796cfc7b
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:33 2011 +0000

    SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing
    
    When the REG property is not available the NODE-ID is used as an unique
    identifier in order to avoid filesystem name duplicates in /proc/openprom
    filesystem
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2791c1a4390085789e37347fc49f7d189fedae88
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:32 2011 +0000

    SPARC/LEON: added support for selecting Timer Core and Timer within core
    
    The ability to select Timer Core and Timer instance for system clock
    makes it possible for multiple AMP systems to coexist.
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:31 2011 +0000

    LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e2305e37d4c82ef55be54e9edc8a7e2250739b4f
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:30 2011 +0000

    SPARC/LEON: added support for IRQAMP IRQ Controller
    
    Needed for LEON AMP systems where different CPUs are routed to
    
    different IRQ controllers. This patch selects the IRQ Controller
    which has been routed to the boot CPU, it is up to the boot loader
    to configure the IRQ controller.
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 53aea7caf2e27108912b9b9dbc5bfe18dbbaec9d
Author: Daniel Hellstrom <daniel@xxxxxxxxxxx>
Date:   Tue Jan 4 01:41:29 2011 +0000

    SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded.
    
    Signed-off-by: Daniel Hellstrom <daniel@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 554d1d027b19265c4aa3f718b3126d2b86e09a08
Author: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
Date:   Thu Dec 23 12:38:21 2010 +0100

    iwlagn: enable only rfkill interrupt when device is down
    
    Since commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd "iwlagn: fix
    hw-rfkill while the interface is down", we enable interrupts when
    device is not ready to receive them. However hardware, when it is in
    some inconsistent state, can generate other than rfkill interrupts
    and crash the system. I can reproduce crash with "kernel BUG at
    drivers/net/wireless/iwlwifi/iwl-agn.c:1010!" message, when forcing
    firmware restarts.
    
    To fix only enable rfkill interrupt when down device and after probe.
    I checked patch on laptop with 5100 device, rfkill change is still
    passed to user space when device is down.
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@xxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Acked-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 8a87694ed159d7abd2c9ed657416696c05db2252
Author: Christoph Hellwig <hch@xxxxxx>
Date:   Tue Jan 4 07:14:24 2011 +0100

    remove trim_fs method from Documentation/filesystems/Locking
    
    The ->trim_fs has been removed meanwhile, so remove it from the 
documentation
    as well.
    
    Signed-off-by: Christoph Hellwig <hch@xxxxxx>
    Reported-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Fri Dec 31 12:34:32 2010 -0300

    [media] v4l2-compat-ioctl32: fix compile warning
    
    drivers/media/video/v4l2-compat-ioctl32.c: In function 'get_v4l2_format32':
    drivers/media/video/v4l2-compat-ioctl32.c:169:2: warning: case value '0' 
not in enumerated type 'enum v4l2_buf_type'
    drivers/media/video/v4l2-compat-ioctl32.c: In function 'put_v4l2_format32':
    drivers/media/video/v4l2-compat-ioctl32.c:200:2: warning: case value '0' 
not in enumerated type 'enum v4l2_buf_type'
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Fri Dec 31 12:30:56 2010 -0300

    [media] zoran: fix compiler warning
    
    drivers/media/video/zoran/zoran_driver.c: In function 'zoran_dqbuf':
    drivers/media/video/zoran/zoran_driver.c:2197:21: warning: 'bs.frame' may 
be used uninitialized in this function
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0c8fc77e481a3bfc243336085a3fe1fc71f9c1fb
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Fri Dec 31 12:26:53 2010 -0300

    [media] tda18218: fix compile warning
    
    drivers/media/common/tuners/tda18218.c: In function 'tda18218_wr_regs':
    drivers/media/common/tuners/tda18218.c:58:5: warning: 'ret' may be used 
uninitialized in this function
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 4f77b86c665ff6a167edfdf152ebfa997783fa17
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Fri Dec 31 12:25:32 2010 -0300

    [media] ngene: fix compile warning
    
    drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_start':
    drivers/media/dvb/ngene/ngene-core.c:1308:16: warning: unused variable 
'flags'
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e6de30d63eb17c5cbb7affdfc71df95286bfa7d9
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:08:37 2011 +0000

    r8169: more 8168dp support.
    
    Adapted from version 8.019.00 of Realtek's r8168 driver
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 650e8d5d1fdd5e55869136e2df54287a4432d87f
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:08:29 2011 +0000

    r8169: rtl_csi_access_enable rename.
    
    Newer 8168 needs a slightly different rtl_csi_access_enable.
    This patch separates some noise from the real thing.
    
    No functional change.
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit b646d90053f887c1bc243191e693a9b02d09f2c2
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:08:21 2011 +0000

    r8169: magic.
    
    Adapted from version 8.019.00 of Realtek's r8168 driver.
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 065c27c184d64aeb9ae107c0ef7026ea3642b15b
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:08:12 2011 +0000

    r8169: phy power ops
    
    Bits from :
    - version 8.019.00 of Realtek's 8168 driver
    - version 1.019.00 of Realtek's 8101 driver
    
    Plain old 8169 (PCI) devices do not seem to need anything akin to it.
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit c0e45c1ca3162acb2e77b3d9e152ce6e7b6fa3f5
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:08:04 2011 +0000

    r8169: 8168DP specific MII registers access methods.
    
    Adapted from version 8.019.00 of Realtek's r8168 driver and
    amended per Hayes Wang's correction :
    - OCPDR_GPHY_REG_SHIFT must be 16, not 12
    - the reg should be at bit 16 ~ 22, whence OCPDR_REG_MASK
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 4da19633429f67c794b013488348550f457298c4
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:07:55 2011 +0000

    r8169: use device dependent methods to access the MII registers.
    
    Current mdio_{read/write} needs device specific information to work
    correctly with newer chipsets.
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f0298f8143e89ac4da306e14b9aa1927e93916d0
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:07:42 2011 +0000

    r8169: identify different registers.
    
    Documentation (sort of).
    
    The location are the same, the values are the same but it is
    just accidental. Note that the 810x could cope with a smaller
    value as it does not support jumbo frames.
    
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Hayes <hayeswang@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0
Author: françois romieu <romieu@xxxxxxxxxxxxx>
Date:   Mon Jan 3 15:07:31 2011 +0000

    r8169: remove the firmware of RTL8111D.
    
    The binary file of the firmware is moved to linux-firmware repository.
    The firmwares are rtl_nic/rtl8168d-1.fw and rtl_nic/rtl8168d-2.fw.
    The driver goes along if the firmware couldn't be found. However, it
    is suggested to be done with the suitable firmware.
    
    Some wrong PHY parameters are directly corrected in the driver.
    
    Simple firmware checking added per Ben Hutchings suggestion.
    
    Signed-off-by: Hayes Wang <hayeswang@xxxxxxxxxxx>
    Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
    Cc: Ben Hutchings <benh@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 101e5f77bf35679809586e250b6c62193d2ed179
Author: Mike Galbraith <efault@xxxxxx>
Date:   Fri Dec 31 09:32:30 2010 +0100

    sched, autogroup: Fix reference leak
    
    The cgroup exit mess also uncovered a struct autogroup reference leak.
    copy_process() was simply freeing vs putting the signal_struct,
    stranding a reference.
    
    Signed-off-by: Mike Galbraith <efault@xxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
    LKML-Reference: <1293784350.6839.2.camel@xxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 4f8219875a0dad2cfad9e93a3fafcd9626db98d2
Author: Mike Galbraith <efault@xxxxxx>
Date:   Thu Dec 16 15:09:52 2010 +0100

    sched, autogroup: Fix potential access to freed memory
    
    Oleg pointed out that the /proc interface kref_get() useage may race with
    the final put during autogroup_move_group().  A signal->autogroup assignment
    may be in flight when the /proc interface dereference, leaving them taking
    a reference to an already dead group.
    
    Reported-by: Oleg Nesterov <oleg@xxxxxxxxxx>
    Signed-off-by: Mike Galbraith <efault@xxxxxx>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <1292508592.5940.28.camel@xxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit a58154d1c3535f451a409abbd0bda6770b2d9380
Author: Yong Shen <yong.shen@xxxxxxxxxx>
Date:   Tue Jan 4 14:22:56 2011 +0800

    ARM i.MX53: Make MX53 EVK bootable
    
    1. Add entries to Kconfig
    2. Add machine definition
    3. Add Uart platform data, pad setting and base address
    4. Adjust GPIO irq number
    
    Signed-off-by: Yong Shen <yong.shen@xxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 644b1d586d6670262501057ae99d893fadb012de
Author: Yong Shen <yong.shen@xxxxxxxxxx>
Date:   Tue Jan 4 14:22:55 2011 +0800

    ARM i.MX53: Some bug fix about MX53 MSL code
    
    1. pll_base address should return right value
    2. uart parent clk is from pll3
    
    Signed-off-by: Yong Shen <yong.shen@xxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3
Author: Alan Ott <alan@xxxxxxxxxxx>
Date:   Tue Jan 4 00:37:22 2011 -0500

    HID: hidraw: add compatibility ioctl() for 32-bit applications.
    
    Added the ioctl function to the compat_ioctl pointer in the file_operations
    struct. Before this, some ioctls would fail for 32-bit apps on 64-bit 
systems.
    
    Signed-off-by: Alan Ott <alan@xxxxxxxxxxx>
    Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit d50d8fe192428090790e7178e9507e981e0b005b
Author: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Date:   Tue Jan 4 17:20:54 2011 +1030

    x86, mm: Initialize initial_page_table before paravirt jumps
    
    v2.6.36-rc8-54-gb40827f (x86-32, mm: Add an initial page table
    for core bootstrapping) made x86 boot using initial_page_table
    and broke lguest.
    
    For 2.6.37 we simply cut & paste the initialization code into
    lguest (da32dac10126 "lguest: populate initial_page_table"), now
    we fix it properly by doing that initialization before the
    paravirt jump.
    
    Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
    Acked-by: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
    Cc: lguest <lguest@xxxxxxxxxx>
    Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    LKML-Reference: <201101041720.54535.rusty@xxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit bc030d6cb9532877c1c5a3f5e7123344fa24a285
Merge: d3bd058826aa8b79590cca6c8e6d1557bf576ada 
387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Tue Jan 4 09:43:42 2011 +0100

    Merge commit 'v2.6.37-rc8' into x86/apic
    
    Conflicts:
        arch/x86/include/asm/io_apic.h
    
    Merge reason: move to a fresh -rc, resolve the conflict.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 6706125e291bd3dddd269e043323a6ab93ccd5fb
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date:   Fri Dec 31 21:58:58 2010 +0800

    sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
    
    CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED
    
    Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@xxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date:   Mon Dec 13 14:56:02 2010 +0100

    firewire: use split transaction timeout only for split transactions
    
    Instead of starting the split transaction timeout timer when any request
    is submitted, start it only when the destination's ACK_PENDING has been
    received.  This prevents us from using a timeout that is too short, and,
    if the controller's AT queue is emptying very slowly, from cancelling
    a packet that has not yet been sent.
    
    Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
    Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>

commit 693a50b511818e07a131efc944cba1a504b63d3d
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date:   Sat Jan 1 15:17:05 2011 +0100

    firewire: ohci: consolidate context status flags
    
    "firewire: ohci: restart iso DMA contexts on resume from low power mode"
    added the flag struct context.active and "firewire: ohci: cache the
    context run bit" added struct context.running.
    
    These flags contain the same information; combine them.
    Also, normalize whitespace in pci_resume().
    
    Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>

commit 386a4153a2c1455e424f280d636efa3c91864466
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date:   Fri Dec 24 14:42:46 2010 +0100

    firewire: ohci: cache the context run bit
    
    The DMA context run control bit is entirely controlled by software, so
    it is safe to cache it.  This allows the driver to avoid doing an
    additional MMIO read when queueing an AT packet.
    
    Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
    Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>

commit 78dec56d6a56322e1b728d51f3a7def416d36b34
Author: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Date:   Sat Jan 1 15:15:40 2011 +0100

    firewire: ohci: flush AT contexts after bus reset - addendum
    
    Add comments
      - on why bus_reset_tasklet flushes AT queues,
      - that commit 76f73ca1b291 can possibly be reverted now.
    
    Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>

commit 672d8eafe38e9324055b8c0d0ad6e95c43b6d52a
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date:   Tue Nov 16 14:33:51 2010 -0600

    ipmi: explicitly include of_address.h and of_irq.h
    
    of_address.h and of_irq.h are implicitly included on powerpc. Adding
    them fixes builds on non-powerpc platforms.
    
    Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 20c457b8587bee4644d998331d9e13be82e05b4c
Author: Thomas Renninger <trenn@xxxxxxx>
Date:   Mon Jan 3 17:50:45 2011 +0100

    perf timechart: Adjust perf timechart to the new power events
    
    builtin-timechart must only pass -e power:xy events if they are supported by
    the running kernel, otherwise try to fetch the old power:power{start,end}
    events.
    
    For this I added the tiny helper function:
    
       int is_valid_tracepoint(const char *event_string)
    
    to parse-events.[hc], which could be more generic as an interface and 
support
    hardware/software/... events, not only tracepoints, but someone else could
    extend that if needed...
    
    Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
    Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    Acked-by: Jean Pihet <j-pihet@xxxxxx>
    LKML-Reference: <1294073445-14812-4-git-send-email-trenn@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 25e41933b58777f2d020c3b0186b430ea004ec28
Author: Thomas Renninger <trenn@xxxxxxx>
Date:   Mon Jan 3 17:50:44 2011 +0100

    perf: Clean up power events by introducing new, more generic ones
    
    Add these new power trace events:
    
     power:cpu_idle
     power:cpu_frequency
     power:machine_suspend
    
    The old C-state/idle accounting events:
      power:power_start
      power:power_end
    
    Have now a replacement (but we are still keeping the old
    tracepoints for compatibility):
    
      power:cpu_idle
    
    and
      power:power_frequency
    
    is replaced with:
      power:cpu_frequency
    
    power:machine_suspend is newly introduced.
    
    Jean Pihet has a patch integrated into the generic layer
    (kernel/power/suspend.c) which will make use of it.
    
    the type= field got removed from both, it was never
    used and the type is differed by the event type itself.
    
    perf timechart userspace tool gets adjusted in a separate patch.
    
    Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
    Acked-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    Acked-by: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
    Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
    Cc: rjw@xxxxxxx
    LKML-Reference: <1294073445-14812-3-git-send-email-trenn@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
    LKML-Reference: <1290072314-31155-2-git-send-email-trenn@xxxxxxx>

commit 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
Author: Thomas Renninger <trenn@xxxxxxx>
Date:   Mon Jan 3 17:50:43 2011 +0100

    perf: Do not export power_frequency, but power_start event
    
    power_frequency moved to drivers/cpufreq/cpufreq.c which has
    to be compiled in, no need to export it.
    
    intel_idle can a be module though...
    
    Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
    Acked-by: Jean Pihet <jean.pihet@xxxxxxxxxxxxxx>
    Cc: Jean Pihet <j-pihet@xxxxxx>
    Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    Cc: rjw@xxxxxxx
    LKML-Reference: <1294073445-14812-2-git-send-email-trenn@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
    LKML-Reference: <1290072314-31155-2-git-send-email-trenn@xxxxxxx>

commit 928585536ff5a8f320e60efc60e2b7ef2a5f548d
Merge: cc2221969906a166a638aecdbae84a3d0462719e 
d854861c4292a4e675a5d3bfd862c5f7421c81e8
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Tue Jan 4 08:10:28 2011 +0100

    Merge branch 'perf/test' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

commit cc2221969906a166a638aecdbae84a3d0462719e
Merge: 56f4c400349157289b474a3fd49ee96acab0a4d7 
387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Tue Jan 4 08:08:51 2011 +0100

    Merge commit 'v2.6.37-rc8' into perf/core
    
    Merge reason: pick up latest -rc.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 55ee4ef30241a62b700f79517e6d5ef2ddbefa67
Author: Christoph Lameter <cl@xxxxxxxxx>
Date:   Thu Dec 16 12:15:15 2010 -0600

    gameport: use this_cpu_read instead of lookup
    
    Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
    Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 357089fca91f639dd005ae0721f5f932b4f276ab
Author: Christoph Lameter <cl@xxxxxxxxx>
Date:   Thu Dec 16 12:14:43 2010 -0600

    x86: udelay: Use this_cpu_read to avoid address calculation
    
    The code will use a segment prefix instead of doing the lookup and
    calculation.
    
    Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
    Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 42bb8d56953a06de50941d6d3df89dc3023bb92d
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Mon Jan 3 15:21:46 2011 +0000

    cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver()
    
    We should call bnx2i to send the iSCSI netlink message earlier in
    cnic_unregister_device().  By the time cnic_unregister_driver() is
    called, bnx2i may have freed data structures used by the upcalls.
    
    Update version to 2.2.12.
    
    Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 57045c996fb4e035f1d152b7e04315fc223352e9
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Mon Jan 3 15:21:45 2011 +0000

    cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode
    
    Because the hardware does not yet support these in this mode.
    
    Reviewed-by: Benjamin Li <benli@xxxxxxxxxxxx>
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 4a3a255289e7e322b8044286cce85031990f888a
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Thu Nov 11 22:42:06 2010 -0800

    sparc: explicitly cast negative phandle checks to s32
    
    When we switched sparc from using 'int's to 'phandle's (which is a u32), we
    neglected to do anything with the various checks for -1.  For those tests,
    explicitly cast the phandles to s32.
    
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Acked-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit d854861c4292a4e675a5d3bfd862c5f7421c81e8
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 00:16:20 2011 -0200

    perf test: Add test for counting open syscalls
    
    To test the use of the perf_evsel class on something other than
    the tools from where we refactored code to create it.
    
    It calls open() N times and then checks if the event created to
    monitor it returns N events.
    
    [acme@felicio linux]$ perf test
     1: vmlinux symtab matches kallsyms: Ok
     2: detect open syscall event: Ok
    [acme@felicio linux]$
    
    It does.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Han Pingtian <phan@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 4eed11d5e24540dc133003b6e8f904cb747ac4bb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Jan 4 00:13:17 2011 -0200

    perf evsel: Auto allocate resources needed for some methods
    
    While writing the first user of the routines created from the ad-hoc
    routines in the existing builtins I noticed that the resulting set of
    calls was too long, reduce it by doing some best effort allocations.
    
    Tools that need to operate on multiple threads and cpus should pre-allocate
    enough resources by explicitely calling the perf_evsel__alloc_{fd,counters}
    methods.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 86bd5e8603b00b06189328c6d7034d2dc434d6bb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 23:09:46 2011 -0200

    perf evsel: Use {cpu,thread}_map to shorten list of parameters
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 5c98d466e49267a9221f30958d45cd06f794269a
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 17:53:33 2011 -0200

    perf tools: Refactor all_tids to hold nr and the map
    
    So that later, we can pass the thread_map instance instead of
    (thread_num, thread_map) for things like perf_evsel__open and friends,
    just like was done with cpu_map.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 60d567e2d9187379d642f6aba7c8a52b3fd5d261
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 17:49:48 2011 -0200

    perf tools: Refactor cpumap to hold nr and the map
    
    So that later, we can pass the cpu_map instance instead of (nr_cpus, 
cpu_map)
    for things like perf_evsel__open and friends.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 48290609c0d265f5dac0fca6fd4e3c5732542f67
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 17:48:12 2011 -0200

    perf evsel: Introduce per cpu and per thread open helpers
    
    Abstracting away the loops needed to create the various event fd handlers.
    
    The users have to pass a confiruged perf->evsel.attr field, which is already
    usable after perf_evsel__new (constructor) time, using defaults.
    
    Comes out of the ad-hoc routines in builtin-stat, that now uses it.
    
    Fixed a small silly bug where we were die()ing before killing our
    children, dysfunctional family this one 8-)
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit c52b12ed2511e6c031a0295fd903ea72b93701fb
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 17:45:52 2011 -0200

    perf evsel: Steal the counter reading routines from stat
    
    Making them hopefully generic enough to be used in 'perf test',
    well see.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 989d873fc5b6a96695b97738dea8d9f02a60f8ab
Merge: d9a1abe4844e7591cd82e167a1a09e6546f6c45e 
04228460a3ded723b2da09141c76c45ddd712caf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 16:37:01 2011 -0800

    Merge master.kernel.org:/home/rmk/linux-2.6-arm
    
    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: pxa: fix page table corruption on resume
      ARM: it8152: add IT8152_LAST_IRQ definition to fix build error
      ARM: pxa: PXA_ESERIES depends on FB_W100.
      ARM: 6605/1: Add missing include "asm/memory.h"
      ARM: 6540/1: Stop irqsoff trace on return to user
      ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers
      ARM: 6536/1: Add missing SZ_{32,64,128}
      ARM: fix cache-feroceon-l2 after stack based kmap_atomic()
      ARM: fix cache-xsc3l2 after stack based kmap_atomic()
      ARM: get rid of kmap_high_l1_vipt()
      ARM: smp: avoid incrementing mm_users on CPU startup
      ARM: pxa: PXA_ESERIES depends on FB_W100.

commit d9a1abe4844e7591cd82e167a1a09e6546f6c45e
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 14:59:11 2011 -0800

    arch/mn10300/kernel/irq.c: fix build
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=25702
    
    Reported-by: Martin Ettl <ettl.martin@xxxxxx>
    Cc: David Howells <dhowells@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 867c20265459d30a01b021a9c1e81fb4c5832aa9
Author: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 14:59:10 2011 -0800

    ima: fix add LSM rule bug
    
    If security_filter_rule_init() doesn't return a rule, then not everything
    is as fine as the return code implies.
    
    This bug only occurs when the LSM (eg. SELinux) is disabled at runtime.
    
    Adding an empty LSM rule causes ima_match_rules() to always succeed,
    ignoring any remaining rules.
    
     default IMA TCB policy:
      # PROC_SUPER_MAGIC
      dont_measure fsmagic=0x9fa0
      # SYSFS_MAGIC
      dont_measure fsmagic=0x62656572
      # DEBUGFS_MAGIC
      dont_measure fsmagic=0x64626720
      # TMPFS_MAGIC
      dont_measure fsmagic=0x01021994
      # SECURITYFS_MAGIC
      dont_measure fsmagic=0x73636673
    
      < LSM specific rule >
      dont_measure obj_type=var_log_t
    
      measure func=BPRM_CHECK
      measure func=FILE_MMAP mask=MAY_EXEC
      measure func=FILE_CHECK mask=MAY_READ uid=0
    
    Thus without the patch, with the boot parameters 'tcb selinux=0', adding
    the above 'dont_measure obj_type=var_log_t' rule to the default IMA TCB
    measurement policy, would result in nothing being measured.  The patch
    prevents the default TCB policy from being replaced.
    
    Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxx>
    Cc: James Morris <jmorris@xxxxxxxxx>
    Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx>
    Cc: David Safford <safford@xxxxxxxxxxxxxx>
    Cc: <stable@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 301a3da358b4af84915f575479e4f0885be47b73
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Mon Jan 3 15:02:47 2011 -0700

    powerpc/405: Fix missing #{address,size}-cells in i2c node
    
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit c8bf6b52af670496f1e8145600e74a3ef3942a4c
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date:   Wed Nov 17 15:28:56 2010 -0800

    powerpc/5200: dts: refactor dts files
    
    This patch creates mpc5200b.dtsi containing the information for the MPC5200b
    SoC then modifies all of the dts files for MPC5200b based systems to use
    mpc5200b.dtsi.
    
    Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 11946c826d02a16521edc777d88470a6a0fe1441
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date:   Wed Nov 17 15:28:47 2010 -0800

    powerpc/5200: dts: Change combatible strings on localbus
    
    This patch changes some incorrect compatible strings on the local plus bus 
node
    in dts files for MPC5200b based systems.
    
    Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 6847317377c871c6e7a8d54e5849bcd0f9b11eb4
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date:   Wed Nov 17 15:28:39 2010 -0800

    powerpc/5200: dts: remove unused properties
    
    This patch remove unused properties in dts files in preparation of 
refactoring
    the dts files for MPC5200b based boards.
    
    Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit abf1e27fbb4200a010b8fcb1be8cc02485744862
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date:   Wed Nov 17 15:28:30 2010 -0800

    powerpc/5200: dts: rename nodes to prepare for refactoring dts files
    
    This patch renames nodes in dts fils for MPC5200b files to prepare for
    refactoring of these files later. When refactoring it will be easier to 
verify
    the results if the node names aren't changing at the same time.
    
    Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 658f29a51e9830e620bb9a1ce3534b318a38bfeb
Author: John Bonesio <bones@xxxxxxxxxxxx>
Date:   Wed Nov 17 15:28:20 2010 -0800

    of/flattree: Update dtc to current mainline.
    
    Pull in recent changes from the main dtc repository. These changes
    primarily allow multiple device trees to be declared which are merged
    by dtc. This feature allows us to include a basic dts file and then
    provide more information for the specific system through the merging
    functionality.
    
    Changes pulled from git://git.jdl.com/software/dtc.git
    commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier"
    
    Signed-off-by: John Bonesio <bones@xxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit cd1e65044d4473cca9a01bae7b7938f065044a4b
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Mon Jan 3 15:51:11 2011 -0700

    of/device: Don't register disabled devices
    
    Device nodes with the property status="disabled" are not usable and so
    don't register them when parsing the device tree for devices.
    
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Cc: Hollis Blanchard <hollis_blanchard@xxxxxxxxxx>
    Cc: Deepak Saxena <deepak_saxena@xxxxxxxxxx>
    Cc: Scott Wood <scottwood@xxxxxxxxxxxxx>,
    Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
    Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>

commit cf562b4a550b3cd9d602a05bc27aaaaa376947b4
Author: Jochen Friedrich <jochen@xxxxxxxx>
Date:   Mon Jan 3 12:19:00 2011 +0100

    ARM: 6607/1: sa1100: Update platform device registration
    
    Replace some magic numbers with constants and add interrupt definitions.
    
    Signed-off-by: Jochen Friedrich <jochen@xxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 4f444e2b59dd4255d121b57ec41a4a8c5d6bce46
Author: Jochen Friedrich <jochen@xxxxxxxx>
Date:   Mon Jan 3 12:09:05 2011 +0100

    ARM: 6606/1: sa1100: Fix platform device registration
    
    Since commit 7a5b4e16c880f8350d255dc188f81622905618c1, simpad devices don't
    boot anymore, since platform devices are registered too early. Fix by moving
    the registration from map_io to arch_initcall as done on other sa1100 
boards.
    
    Signed-off-by: Jochen Friedrich <jochen@xxxxxxxx>
    Acked-by: Kristoffer Ericson <kristoffer.ericson@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 04228460a3ded723b2da09141c76c45ddd712caf
Merge: 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 
24c78557741395e038e83f25367cf2bfd7f582b8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 22:55:21 2011 +0000

    Merge branch 'fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

commit 82b662dc41027527675740de15344d1b4e34958e
Author: Clemens Ladisch <clemens@xxxxxxxxxx>
Date:   Fri Dec 24 14:40:15 2010 +0100

    firewire: ohci: flush AT contexts after bus reset for OHCI 1.2
    
    The OHCI 1.2 (draft) specification, clause 7.2.3.3, allows and
    recommends that, after a bus reset, the controller does not flush all
    the packets in the AT queues.  Therefore, the driver has to do this
    itself.
    
    Signed-off-by: Clemens Ladisch <clemens@xxxxxxxxxx>
    Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>

commit 1a9180a20f3a314fda3e96b77570cad3864b2896
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date:   Mon Jan 3 11:08:58 2011 +0000

    net/bridge: fix trivial sparse errors
    
    net/bridge//br_stp_if.c:148:66: warning: conversion of
    net/bridge//br_stp_if.c:148:66:     int to
    net/bridge//br_stp_if.c:148:66:     int enum umh_wait
    
    net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as 
NULL pointer
    
    Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit ebd80880c55364d2850e1ff569869245142318e0
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:22:15 2011 +0000

    depca: Fix section mismatch derived from depca_isa_probe()
    
    This fixes the following warning:
    
    WARNING: drivers/net/depca.o(.data+0x0): Section mismatch in reference from 
the variable depca_isa_driver to the function .init.text:depca_isa_probe()
    The variable depca_isa_driver references
    the function __init depca_isa_probe()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
    
    Tested with linux-next (next-20101231)
    
    Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 1170bed04e2acf720de9ccceabe40ff8c56c9c79
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:15:58 2011 +0000

    smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe()
    
    This fixes the following warning:
    
    drivers/net/irda/smsc-ircc2.o(.data+0x18): Section mismatch in reference 
from the variable smsc_ircc_pnp_driver to the function 
.init.text:smsc_ircc_pnp_probe()
    The variable smsc_ircc_pnp_driver references
    the function __init smsc_ircc_pnp_probe()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
    
    Tested with linux-next (next-20101231)
    
    Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit cbad832239e70b91502a5e6ce1fc53a464ad6345
Author: Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:06:58 2011 +0000

    ksz884x: Fix section mismatch derived from pcidev_init()
    
    This fixes the following warning:
    
    WARNING: drivers/net/ksz884x.o(.data+0x18): Section mismatch in reference 
from the variable pci_device_driver to the function .init.text:pcidev_init()
    The variable pci_device_driver references
    the function __init pcidev_init()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
    
    Tested with linux-next (next-20101231)
    
    Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 6bd121e2d4dcabb145d390a7131ec83102dfb838
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Mon Jan 3 14:06:17 2011 -0700

    powerpc/dts: fix syntax bugs in bluestone.dts
    
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit da81c3b9825c826bfb06a4dcc0524c671985eb68
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date:   Tue Nov 16 14:33:50 2010 -0600

    of: Fixes for OF probing on little endian systems
    
    Fixes for sdhci-of and ipmi drivers.
    
    Auditing all drivers using of_get_property did not find other
    occurrences likely to be used on LE platforms.
    
    Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 236cdc7bc718566a7e7cb9f763b51a8dcad88cbe
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date:   Mon Jan 3 11:56:38 2011 -0600

    of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
    
    Some OF drivers could likely be used on non-powerpc OF based platforms,
    so fix the kconfig depends to be CONFIG_OF instead of CONFIG_PPC_OF.
    
    Compile tested on ARM and sparc.
    
    Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 39980292fda20b38baf95bfa577db8b678eecc86
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Mon Jan 3 10:35:22 2011 +0000

    ifb: add performance flags
    
    Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit :
    > From: Jarek Poplawski <jarkao2@xxxxxxxxx>
    > Date: Mon, 3 Jan 2011 20:37:03 +0100
    >
    > > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote:
    > >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit 
:
    > >>
    > >> > Ingress is before vlans handler so these features and the
    > >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering
    > >> > dev_hard_start_xmit() checks.
    > >>
    > >> OK, here is v2 of the patch then, thanks everybody.
    > >>
    > >>
    > >> [PATCH v2 net-next-2.6] ifb: add performance flags
    > >>
    > >> IFB can use the full set of features flags (NETIF_F_SG |
    > >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
    > >> avoid unnecessary split of some packets (GRO for example)
    > >>
    > >> Changli suggested to also set vlan_features,
    > >
    > > He also suggested more GSO flags of which especially NETIF_F_TSO6
    > > seems interesting (wrt GRO)?
    >
    > I think at least TSO6 would very much be appropriate here.
    
    Yes, why not, I am only wondering why loopback / dummy (and others ?)
    only set NETIF_F_TSO :)
    
    Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;)
    
    For other flags, I really doubt it can matter on ifb ?
    
    [PATCH v3 net-next-2.6] ifb: add performance flags
    
    IFB can use the full set of features flags (NETIF_F_SG |
    NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to
    avoid unnecessary split of some packets (GRO for example)
    
    Changli suggested to also set vlan_features, NETIF_F_TSO6,
    NETIF_F_TSO_ECN.
    
    Jarek suggested to add NETIF_F_HW_VLAN_TX as well.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Cc: Changli Gao <xiaosuo@xxxxxxxxx>
    Cc: Jarek Poplawski <jarkao2@xxxxxxxxx>
    Cc: Pawel Staszewski <pstaszewski@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 5f66dd35b49ea81a03e71bfd74c28364f4e32d21
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Mon Jan 3 08:27:55 2011 +0000

    sparc: fix sparse warnings in arch/sparc/prom for 32 bit build
    
    Fix following sparse warnings:
    arch/sparc/prom/bootstr_32.c:32:35: warning: Using plain integer as NULL 
pointer
    arch/sparc/prom/memory.c:61:13: warning: symbol 'prom_meminit' was not 
declared. Should it be static?
    arch/sparc/prom/misc_32.c:74:1: error: symbol 'prom_halt' redeclared with 
different type (originally declared at arch/sparc/include/asm/oplib_32.h:67) - 
different modifiers
    arch/sparc/prom/ranges.c:16:26: warning: symbol 'promlib_obio_ranges' was 
not declared. Should it be static?
    arch/sparc/prom/ranges.c:17:5: warning: symbol 'num_obio_ranges' was not 
declared. Should it be static?
    arch/sparc/prom/ranges.c:39:1: warning: symbol 'prom_adjust_ranges' was not 
declared. Should it be static?
    arch/sparc/prom/ranges.c:69:13: warning: symbol 'prom_ranges_init' was not 
declared. Should it be static?
    arch/sparc/prom/tree_32.c:286:22: warning: Using plain integer as NULL 
pointer
    arch/sparc/prom/tree_32.c:286:38: warning: Using plain integer as NULL 
pointer
    
    None of the warnings indicated any serious issues.
    
    We are now sparse clean for 32 bit build in arch/sparc/prom.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0dfb33a0d7e2d9316eb4441a065ddd173f87223e
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Mon Jan 3 08:11:38 2011 +0000

    sch_red: report backlog information
    
    Provide child qdisc backlog (byte count) information so that "tc -s
    qdisc" can report it to user.
    
    packet count is already correctly provided.
    
    qdisc red 11: parent 1:11 limit 60Kb min 15Kb max 45Kb ecn
     Sent 3116427684 bytes 1415782 pkt (dropped 8, overlimits 7866 requeues 0)
     rate 242385Kbit 13630pps backlog 13560b 8p requeues 0
      marked 7865 early 1 pdrop 7 other 0
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7f891cf1fc0d5d5c5b359caec77e5383e1d55986
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date:   Mon Jan 3 08:04:59 2011 +0000

    dcbnl: more informed return values for new dcbnl routines
    
    More accurate return values for the following (new) dcbnl routines:
    dcbnl_getdcbx()
    dcbnl_setdcbx()
    dcbnl_getfeatcfg()
    dcbnl_setfeatcfg()
    
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e6f26129ebbb0071016e2526036f42036ccf30e1
Author: Florian Westphal <fw@xxxxxxxxx>
Date:   Mon Jan 3 04:16:28 2011 +0000

    bridge: stp: ensure mac header is set
    
    commit bf9ae5386bca8836c16e69ab8fdbe46767d7452a
    (llc: use dev_hard_header) removed the
    skb_reset_mac_header call from llc_mac_hdr_init.
    
    This seems fine itself, but br_send_bpdu() invokes ebtables LOCAL_OUT.
    
    We oops in ebt_basic_match() because it assumes eth_hdr(skb) returns
    a meaningful result.
    
    Cc: acme@xxxxxxxxxxxxxxxxxx
    References: https://bugzilla.kernel.org/show_bug.cgi?id=24532
    Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 87e609760b5304ef0c0c53cf4d0b29fde9812e1b
Author: Michal Simek <monstr@xxxxxxxxx>
Date:   Mon Jan 3 00:32:36 2011 +0000

    ll_temac: Fix section mismatch from the temac_of_probe
    
    Replace __init by __devinit.
    
    Warning message:
    WARNING: vmlinux.o(.data+0xbc14): Section mismatch in reference from the 
variable
    temac_of_driver to the function .init.text:temac_of_probe()
    The variable temac_of_driver references
    the function __init temac_of_probe()
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
    
    Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
    Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 68763c890eb2a60f9b50a061502f94e0cf20fdfe
Author: Michal Simek <monstr@xxxxxxxxx>
Date:   Sun Jan 2 22:54:09 2011 +0000

    trivial: Fix typo fault in netdevice.h
    
    Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9f84f8886b98a9411ee20a10ca390487507037b9
Author: amit salecha <amit.salecha@xxxxxxxxxx>
Date:   Sun Jan 2 21:58:45 2011 +0000

    netxen: update driver version 4.0.75
    
    Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e4baaf719807ffc87c6321f3914b93dd512b64c4
Author: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
Date:   Sun Jan 2 21:58:44 2011 +0000

    netxen: enable LRO based on NETIF_F_LRO
    
    o Enable/disable LRO in device based on NETIF_F_LRO flag, instead of using
      driver private flag.
    o Disable LRO, if rx csum offloading is off.
    
    David Miller,
        You should use netdev_info() instead of dev_info().
    
    Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@xxxxxxxxxx>
    Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 03ed6a3aa600c48593c3984812fda2d5945ddb46
Merge: 4c37a4b53de2d08c469a6e4304cf2a17178200aa 
a0a2b71bb750ffe9b3faa317cb6317f4ad109383
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:51:22 2011 -0800

    Merge branch 'perf-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix callchain hit bad cast on ascii display
      arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
      watchdog: Improve initialisation error message and documentation

commit 4c37a4b53de2d08c469a6e4304cf2a17178200aa
Merge: d45fa563a62c908d0e9a581d4f091fed6371ebd0 
8fd0bda511406ef0e9dcce9be055d7ab931e92ba
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:50:26 2011 -0800

    Merge branch 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      [media] em28xx: radio_fops should also use unlocked_ioctl
      [media] wm8775: Revert changeset fcb9757333 to avoid a regression
      [media] cx25840: Prevent device probe failure due to volume control 
ERANGE error

commit d45fa563a62c908d0e9a581d4f091fed6371ebd0
Merge: a1cf11d8f673a3ad91012c5da96beed06ecefde1 
8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 11:48:54 2011 -0800

    Merge branch 'fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
      dmaengine: provide dummy functions for DMA_ENGINE=n
      mv_xor: fix race in tasklet function

commit a1cf11d8f673a3ad91012c5da96beed06ecefde1
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date:   Mon Jan 3 15:07:02 2011 +0000

    name_to_dev_t() must not call __init code
    
    The function can't be __init itself (being called from some sysfs
    handler), and hence none of the functions it calls can be either.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
    Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f
Author: Cliff Wickman <cpw@xxxxxxx>
Date:   Mon Jan 3 12:03:53 2011 -0600

    x86, UV, BAU: Extend for more than 16 cpus per socket
    
    Fix a hard-coded limit of a maximum of 16 cpu's per socket.
    
    The UV Broadcast Assist Unit code initializes by scanning the
    cpu topology of the system and assigning a master cpu for each
    socket and UV hub. That scan had an assumption of a limit of 16
    cpus per socket. With Westmere we are going over that limit.
    The UV hub hardware will allow up to 32.
    
    If the scan finds the system has gone over that limit it returns
    an error and we print a warning and fall back to doing TLB
    shootdowns without the BAU.
    
    Signed-off-by: Cliff Wickman <cpw@xxxxxxx>
    Cc: <stable@xxxxxxxxxx> # .37.x
    LKML-Reference: <E1PZol7-0000mM-77@xxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 9d89081d698132b5f964aea88112f76492563ee9
Author: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Date:   Mon Jan 3 11:26:08 2011 -0800

    bridge: fix br_multicast_ipv6_rcv for paged skbs
    
    use pskb_may_pull to access ipv6 header correctly for paged skbs
    It was omitted in the bridge code leading to crash in blind
    __skb_pull
    
    since the skb is cloned undonditionally we also simplify the
    the exit path
    
    this fixes bug https://bugzilla.kernel.org/show_bug.cgi?id=25202
    
    Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: 
authenticated
    Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 IEEE 802.11: 
associated (aid 2)
    Dec 15 14:36:40 User-PC hostapd: wlan0: STA 00:15:00:60:5d:34 RADIUS: 
starting accounting session 4D0608A3-00000005
    Dec 15 14:36:41 User-PC kernel: [175576.120287] ------------[ cut here 
]------------
    Dec 15 14:36:41 User-PC kernel: [175576.120452] kernel BUG at 
include/linux/skbuff.h:1178!
    Dec 15 14:36:41 User-PC kernel: [175576.120609] invalid opcode: 0000 [#1] 
SMP
    Dec 15 14:36:41 User-PC kernel: [175576.120749] last sysfs file: 
/sys/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/uevent
    Dec 15 14:36:41 User-PC kernel: [175576.121035] Modules linked in: 
approvals binfmt_misc bridge stp llc parport_pc ppdev arc4 iwlagn 
snd_hda_codec_realtek iwlcore i915 snd_hda_intel mac80211 joydev snd_hda_codec 
snd_hwdep snd_pcm snd_seq_midi drm_kms_helper snd_rawmidi drm 
snd_seq_midi_event snd_seq snd_timer snd_seq_device cfg80211 eeepc_wmi usbhid 
psmouse intel_agp i2c_algo_bit intel_gtt uvcvideo agpgart videodev 
sparse_keymap snd shpchp v4l1_compat lp hid video serio_raw soundcore output 
snd_page_alloc ahci libahci atl1c
    Dec 15 14:36:41 User-PC kernel: [175576.122712]
    Dec 15 14:36:41 User-PC kernel: [175576.122769] Pid: 0, comm: kworker/0:0 
Tainted: G        W   2.6.37-rc5-wl+ #3 1015PE/1016P
    Dec 15 14:36:41 User-PC kernel: [175576.123012] EIP: 0060:[<f83edd65>] 
EFLAGS: 00010283 CPU: 1
    Dec 15 14:36:41 User-PC kernel: [175576.123193] EIP is at 
br_multicast_rcv+0xc95/0xe1c [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.123362] EAX: 0000001c EBX: f5626318 
ECX: 00000000 EDX: 00000000
    Dec 15 14:36:41 User-PC kernel: [175576.123550] ESI: ec512262 EDI: f5626180 
EBP: f60b5ca0 ESP: f60b5bd8
    Dec 15 14:36:41 User-PC kernel: [175576.123737]  DS: 007b ES: 007b FS: 00d8 
GS: 00e0 SS: 0068
    Dec 15 14:36:41 User-PC kernel: [175576.123902] Process kworker/0:0 (pid: 
0, ti=f60b4000 task=f60a8000 task.ti=f60b0000)
    Dec 15 14:36:41 User-PC kernel: [175576.124137] Stack:
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  ec556500 f6d06800 f60b5be8 
c01087d8 ec512262 00000030 00000024 f5626180
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  f572c200 ef463440 f5626300 
3affffff f6d06dd0 e60766a4 000000c4 f6d06860
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  ffffffff ec55652c 00000001 
f6d06844 f60b5c64 c0138264 c016e451 c013e47d
    Dec 15 14:36:41 User-PC kernel: [175576.124181] Call Trace:
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c01087d8>] ? 
sched_clock+0x8/0x10
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0138264>] ? 
enqueue_entity+0x174/0x440
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c016e451>] ? 
sched_clock_cpu+0x131/0x190
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c013e47d>] ? 
select_task_rq_fair+0x2ad/0x730
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0524fc1>] ? 
nf_iterate+0x71/0x90
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f83e4914>] ? 
br_handle_frame_finish+0x184/0x220 [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f83e4790>] ? 
br_handle_frame_finish+0x0/0x220 [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f83e46e9>] ? 
br_handle_frame+0x189/0x230 [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f83e4790>] ? 
br_handle_frame_finish+0x0/0x220 [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f83e4560>] ? 
br_handle_frame+0x0/0x230 [bridge]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c04ff026>] ? 
__netif_receive_skb+0x1b6/0x5b0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c04f7a30>] ? 
skb_copy_bits+0x110/0x210
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0503a7f>] ? 
netif_receive_skb+0x6f/0x80
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f82cb74c>] ? 
ieee80211_deliver_skb+0x8c/0x1a0 [mac80211]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f82cc836>] ? 
ieee80211_rx_handlers+0xeb6/0x1aa0 [mac80211]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c04ff1f0>] ? 
__netif_receive_skb+0x380/0x5b0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c016e242>] ? 
sched_clock_local+0xb2/0x190
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c012b688>] ? 
default_spin_lock_flags+0x8/0x10
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c05d83df>] ? 
_raw_spin_lock_irqsave+0x2f/0x50
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f82cd621>] ? 
ieee80211_prepare_and_rx_handle+0x201/0xa90 [mac80211]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f82ce154>] ? 
ieee80211_rx+0x2a4/0x830 [mac80211]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f815a8d6>] ? 
iwl_update_stats+0xa6/0x2a0 [iwlcore]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f8499212>] ? 
iwlagn_rx_reply_rx+0x292/0x3b0 [iwlagn]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c05d83df>] ? 
_raw_spin_lock_irqsave+0x2f/0x50
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f8483697>] ? 
iwl_rx_handle+0xe7/0x350 [iwlagn]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<f8486ab7>] ? 
iwl_irq_tasklet+0xf7/0x5c0 [iwlagn]
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c01aece1>] ? 
__rcu_process_callbacks+0x201/0x2d0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0150d05>] ? 
tasklet_action+0xc5/0x100
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0150a07>] ? 
__do_softirq+0x97/0x1d0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c05d910c>] ? 
nmi_stack_correct+0x2f/0x34
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0150970>] ? 
__do_softirq+0x0/0x1d0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  <IRQ>
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c01508f5>] ? 
irq_exit+0x65/0x70
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c05df062>] ? 
do_IRQ+0x52/0xc0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c01036b0>] ? 
common_interrupt+0x30/0x38
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c03a1fc2>] ? 
intel_idle+0xc2/0x160
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c04daebb>] ? 
cpuidle_idle_call+0x6b/0x100
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c0101dea>] ? 
cpu_idle+0x8a/0xf0
    Dec 15 14:36:41 User-PC kernel: [175576.124181]  [<c05d2702>] ? 
start_secondary+0x1e8/0x1ee
    
    Cc: David Miller <davem@xxxxxxxxxxxxx>
    Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
    Cc: Stephen Hemminger <shemminger@xxxxxxxxxx>
    Signed-off-by: Tomas Winkler <tomas.winkler@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0cf445ceaf43be31c5fc70b0e2d5fdccb291c925
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date:   Sat Jan 1 13:28:30 2011 +0000

    netdev: Update status of 8390 based drivers in MAINTAINERS
    
    With the original 8 bit ISA ne1000 card being over 20 years old, it
    only makes sense to consider ne.c and all the other toplevel 8390
    based driver files as legacy for obsolete hardware.  The most
    recent thing made in large quantities that was 8390 based were
    those crazy PCI ne2k clones - and even they are now 10+ years old.
    
    Also remove myself as maintainer, since the only changes to these
    drivers going forward will be the generic API type changes that
    touch all drivers.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f08c3117c349ea56bd57be347b0b5f8be8c3143c
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date:   Sat Jan 1 13:15:01 2011 +0000

    net/Space: delete orphaned externs from deleted drivers
    
    The drivers associated with the prototypes in this commit have
    been deleted some time ago, but the externs escaped detection.
    Using a simple "git grep" shows that these references are
    historical artefacts, only mentioned by the deleted lines.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2f32c867219734b06abc980d4812f67b6d6fe517
Author: J. K. Cliburn <jcliburn@xxxxxxxxx>
Date:   Sat Jan 1 05:02:12 2011 +0000

    atl1: fix oops when changing tx/rx ring params
    
    Commit 3f5a2a713aad28480d86b0add00c68484b54febc zeroes out the statistics
    message block (SMB) and coalescing message block (CMB) when adapter ring
    resources are freed.  This is desirable behavior, but, as a side effect,
    the commit leads to an oops when atl1_set_ringparam() attempts to alter
    the number of rx or tx elements in the ring buffer (by using ethtool
    -G, for example).  We don't want SMB or CMB to change during this
    operation.
    
    Modify atl1_set_ringparam() to preserve SMB and CMB when changing ring
    parameters.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Jay Cliburn <jcliburn@xxxxxxxxx>
    Reported-by: Tõnu Raitviir <jussuf@xxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a0a2b71bb750ffe9b3faa317cb6317f4ad109383
Merge: c7c25802b39c443b3745cfa973dc49a97a3491f8 
d425de5436a620de506f9e4119bf8daa1cb93718
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Mon Jan 3 19:59:24 2011 +0100

    Merge branch 'perf/urgent' of 
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into 
perf/urgent

commit 70d544d0576775a2b3923a7e68cb49b0313d80c9
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 16:51:39 2011 -0200

    perf evsel: Delete the event selectors at exit
    
    Freeing all the possibly allocated resources, reducing complexity
    on each tool exit path.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 1e7972cc5c16e06f258b0278d8c9adfb5aa75c68
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 16:50:55 2011 -0200

    perf util: Move do_read from session to util
    
    Not really something to be exported from session.c. Rename it to
    'readn' as others did in the past.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit daec78a09de3df5fbfbbd167da0304d49d7fcfe5
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 16:49:44 2011 -0200

    perf evsel: Adopt MATCH_EVENT macro from 'stat'
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 69aad6f1ee69546dea8535ab8f3da9f445d57328
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Mon Jan 3 16:39:04 2011 -0200

    perf tools: Introduce event selectors
    
    Out of ad-hoc code and global arrays with hard coded sizes.
    
    This is the first step on having a library that will be first
    used on regression tests in the 'perf test' tool.
    
    [acme@felicio linux]$ size /tmp/perf.before
       text        data     bss     dec     hex filename
    1273776       97384 5104416 6475576  62cf38 /tmp/perf.before
    [acme@felicio linux]$ size /tmp/perf.new
       text        data     bss     dec     hex filename
    1275422       97416 1392416 2765254  2a31c6 /tmp/perf.new
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit c32e061fa19893ce4acf95d97d5613a161f0f1b7
Author: roel kluin <roel.kluin@xxxxxxxxx>
Date:   Sat Jan 1 19:40:23 2011 +0100

    [SCSI] arcmsr: fix write to device check
    
    Use command->sc_data_direction instead of trying (incorrectly) to
    figure it out from the command itself
    
    [jejb: fix up compile failure]
    Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
    Acked-by: NickCheng <nick.cheng@xxxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 474ffb74c75ea9845860ffb24cdc127eda0d5657
Author: Tomas Henzl <thenzl@xxxxxxxxxx>
Date:   Wed Dec 22 16:52:40 2010 +0100

    [SCSI] lpfc: lower stack use in lpfc_fc_frame_check
    
    according to checkstack the lpfc_fc_frame_check occupies the first
    place in stack usage:
    
    make checkstack
    objdump -d vmlinux $(find . -name '*.ko') | \
        perl 
/root/rpmbuild/BUILD/kernel-2.6.32/linux-2.6.32.x86_64/scripts/checkstack.pl 
x86_64
    0x000013f4 lpfc_fc_frame_check [lpfc]:                      1936
    ...
    This change makes the rctl_names static, thus not on stack.
    
    Signed-off-by: Tomas Henzl <thenzl@xxxxxxxxxx>
    Acked-by: James Smart <james.smart@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474
Author: R, Durgadoss <durgadoss.r@xxxxxxxxx>
Date:   Mon Jan 3 17:22:04 2011 +0530

    x86, hwmon: Add core threshold notification to therm_throt.c
    
    This patch adds code to therm_throt.c to notify core thermal threshold
    events. These thresholds are supported by the IA32_THERM_INTERRUPT register.
    The status/log for the same is monitored using the IA32_THERM_STATUS 
register.
    The necessary #defines are in msr-index.h. A call back is added to mce.h, to
    further notify the thermal stack, about the threshold events.
    
    Signed-off-by: Durgadoss R <durgadoss.r@xxxxxxxxx>
    LKML-Reference: 
<D6D887BA8C9DFF48B5233887EF04654105C1251710@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>

commit 41511704b678f7b101a76e58d6c6b7bbe2a9ad70
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date:   Mon Nov 15 16:04:56 2010 -0500

    [SCSI] eliminate an unnecessary local variable from scsi_remove_target()
    
    Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 96de6d447f40612acb93f81a561a834177cca685
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date:   Mon Dec 6 11:37:30 2010 +0100

    ARM i.MX51: rename IPU irqs
    
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit b848169b37f71c494ea59b260ba665290c23c350
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date:   Mon Dec 6 09:13:21 2010 +0100

    ARM i.MX51: Add ipu clock support
    
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 24c78557741395e038e83f25367cf2bfd7f582b8
Author: Aric D. Blumer <aric@xxxxxxxxxxxxxx>
Date:   Wed Dec 29 11:18:29 2010 -0500

    ARM: pxa: fix page table corruption on resume
    
    Before this patch, the following error would sometimes occur after a
    resume on pxa3xx:
    
        /path/to/mm/memory.c:144: bad pmd 8040542e.
    
    The problem was that a temporary page table mapping was being improperly
    restored.
    
    The PXA3xx resume code creates a temporary mapping of resume_turn_on_mmu
    to avoid a prefetch abort.  The pxa3xx_resume_after_mmu code requires
    that the r1 register holding the address of this mapping not be
    modified, however, resume_turn_on_mmu does modify it. It is mostly
    correct in that r1 receives the base table address, but it may also
    get other bits in 13:0.  This results in pxa3xx_resume_after_mmu
    restoring the original mapping to the wrong place, corrupting memory
    and leaving the temporary mapping in place.
    
    Signed-off-by: Matt Reimer <mreimer@xxxxxxxxxxxxxx>
    Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>

commit 823a2df258627b80df2e75056b850424a8eb5fed
Author: Mike Rapoport <mike@xxxxxxxxxxxxxx>
Date:   Wed Dec 29 09:06:26 2010 +0200

    ARM: it8152: add IT8152_LAST_IRQ definition to fix build error
    
    The commit 6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (ARM: pxa: encode
    IRQ number into .nr_irqs) removed definition of ITE_LAST_IRQ which
    caused the following build error:
    
    CC      arch/arm/common/it8152.o
    arch/arm/common/it8152.c: In function 'it8152_init_irq':
    arch/arm/common/it8152.c:86: error: 'IT8152_LAST_IRQ' undeclared (first use 
in this function)
    arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported 
only once
    arch/arm/common/it8152.c:86: error: for each function it appears in.)
    make[2]: *** [arch/arm/common/it8152.o] Error 1
    
    Defining the IT8152_LAST_IRQ in the arch/arm/include/hardware/it8152.c
    fixes the build.
    
    Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
    Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>

commit 82427de2c7c39ee7bcaa4cb0260b4e9b9ab19eb8
Author: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
Date:   Wed Dec 15 07:20:16 2010 +0800

    ARM: pxa: PXA_ESERIES depends on FB_W100.
    
    As arch/arm/mach-pxa/eseries.c references w100fb_gpio_{read,write}()
    directly.
    
    Signed-off-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxx>
    Signed-off-by: Eric Miao <eric.y.miao@xxxxxxxxx>

commit d425de5436a620de506f9e4119bf8daa1cb93718
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date:   Mon Jan 3 16:13:11 2011 +0100

    perf: Fix callchain hit bad cast on ascii display
    
    ipchain__fprintf_graph() casts the number of hits in a branch as an
    int, which means we lose its highests bits.
    
    This results in meaningless number of callchain hits in perf.data
    that have a high number of hits recorded, typically those that have
    callchain branches hits appearing more than INT_MAX. This happens
    easily as those are pondered by the event period.
    
    Reported-by: Nick Piggin <npiggin@xxxxxxxxx>
    Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>

commit c67a3e09a5316bb34a14e2751cee719339934235
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Mon Jan 3 11:16:39 2011 -0200

    ARM: imx/mx27_3ds: Add PMIC support
    
    MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port.
    
    Add support for the PMIC.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit c7c25802b39c443b3745cfa973dc49a97a3491f8
Author: Robert Richter <robert.richter@xxxxxxx>
Date:   Mon Jan 3 12:15:14 2011 +0100

    arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
    
    Disable preemption in init_ibs(). The function only checks the
    ibs capabilities and sets up pci devices (if necessary). It runs
    only on one cpu but operates with the local APIC and some MSRs,
    thus it is better to disable preemption.
    
    [    7.034377] BUG: using smp_processor_id() in preemptible [00000000] 
code: modprobe/483
    [    7.034385] caller is setup_APIC_eilvt+0x155/0x180
    [    7.034389] Pid: 483, comm: modprobe Not tainted 2.6.37-rc1-20101110+ #1
    [    7.034392] Call Trace:
    [    7.034400]  [<ffffffff812a2b72>] debug_smp_processor_id+0xd2/0xf0
    [    7.034404]  [<ffffffff8101e985>] setup_APIC_eilvt+0x155/0x180
    [ ... ]
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22812
    
    Reported-by: <atswartz@xxxxxxxxx>
    Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
    Cc: oprofile-list@xxxxxxxxxxxxxxxxxxxxx 
<oprofile-list@xxxxxxxxxxxxxxxxxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Rafael J. Wysocki <rjw@xxxxxxx>
    Cc: Dan Carpenter <error27@xxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Cc: <stable@xxxxxxxxxx>         [2.6.37.x]
    LKML-Reference: <20110103111514.GM4739@xxxxxxxxxxxx>
    [ small cleanups ]
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 8fd0bda511406ef0e9dcce9be055d7ab931e92ba
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 18 09:59:51 2010 -0300

    [media] em28xx: radio_fops should also use unlocked_ioctl
    
    em28xx uses core assisted locking, so it shouldn't use .ioctl.
    The .ioctl callback was replaced by .unlocked_ioctl for video nodes,
    but not for radio nodes. This is now corrected.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9eedd96301cad8ab58ee8c1e579677d0a75c2ba1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 00:00:17 2011 +0000

    ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
    
    Replace the page_to_dma() and dma_to_page() macros with their PFN
    equivalents.  This allows us to map parts of memory which do not have
    a struct page allocated to them to bus addresses.  This will be used
    internally by dma_alloc_coherent()/dma_alloc_writecombine().
    
    Build tested on Versatile, OMAP1, IOP13xx and KS8695.
    
    Tested-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 46e67acd5d4cacda758e871eebd15cef4e2c2665
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Jan 3 09:09:56 2011 -0200

    [media] wm8775: Revert changeset fcb9757333 to avoid a regression
    
    It seems that cx88 and ivtv use wm8775 on some different modes. The
    patch that added support for a board with wm8775 broke ivtv boards with
    this device. As we're too close to release 2.6.37, let's just revert
    it.
    
    Reported-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Reported-by: Eric Sharkey <eric@xxxxxxxxxxxxx>
    Reported-by: Auric <auric@xxxxxxxxxxxx>
    Reported by: David Gesswein <djg@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f23b7952d37c69c0caa6c8dfb85dbf2eb9e5fcaa
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Sun Dec 5 19:42:30 2010 -0300

    [media] cx25840: Prevent device probe failure due to volume control ERANGE 
error
    
    This patch fixes a regression that crept into 2.6.36.
    
    The volume control scale in the cx25840 driver has an unusual mapping
    from register values to v4l2 volume control values.  Enforce the mapping
    limits, so that the default volume control setting does not fall out of
    bounds to prevent the cx25840 module device probe from failing.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit cde9efef401563943d5a58eb9b7274bfdc08ca9b
Merge: 50401d77ee4904673042dd737eed436067cc23f5 
60ebe1568fd15b7ffa101acc645069e27d546ed6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 10:31:54 2011 +0000

    Merge branch 'ux500-core' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into 
devel-stable

commit 50401d77ee4904673042dd737eed436067cc23f5
Merge: 206323c181371f3d5fab36c6d33e1fac09b61082 
760efe6910d5743084b586d3d0a3b65aea96fb2f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Jan 3 10:31:38 2011 +0000

    Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx 
into devel-stable

commit 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Wed Dec 22 14:46:46 2010 +0100

    dmaengine: provide dummy functions for DMA_ENGINE=n
    
    This lets drivers, optionally using the dmaengine, build with DMA_ENGINE
    unselected.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>

commit 8333f65ef094e47020cd01452b4637e7daf5a77f
Author: Saeed Bishara <saeed@xxxxxxxxxxx>
Date:   Tue Dec 21 16:53:39 2010 +0200

    mv_xor: fix race in tasklet function
    
    use mv_xor_slot_cleanup() instead of __mv_xor_slot_cleanup() as the former 
function
    aquires the spin lock that needed to protect the drivers data.
    
    Cc: <stable@xxxxxxxxxx>
    Signed-off-by: Saeed Bishara <saeed@xxxxxxxxxxx>
    Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>

commit 711669e5b80b6f2d88f61ed8a9681f83d8cbd201
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date:   Mon Dec 20 16:48:58 2010 +0100

    mx51: fix usb clock support
    
    Current code doesn't really enable the usb clocks so if they're disabled
    when booting linux, the kernel/machine will hang as soon as someone is 
trying
    to read a usb register
    
    Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 8305ed75d1418f02933a48bcabdbb5032d885628
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date:   Mon Dec 20 16:48:57 2010 +0100

    MX51: Add support for usb host 2
    
    Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 08406f540c7ce4cfed96fb240906eee04b9e3eb7
Author: Arnaud Patard (Rtp) <arnaud.patard@xxxxxxxxxxx>
Date:   Mon Dec 20 16:48:56 2010 +0100

    arch/arm/plat-mxc/ehci.c: fix errors/typos
    
    This patch is fixing some issues :
    
    - MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register.
    - the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never 
allows
      to set them.
    
    Signed-off-by: Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 0d95b75e2dd736b23f7cc0971d2f2aacea7f3e49
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Tue Dec 21 16:38:22 2010 -0200

    ARM: mx3/mx31_3ds: Add support for USB Host2 port
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 1c50e67263a6ab8abb9234e2357bd02134fb4b99
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Tue Dec 21 16:38:21 2010 -0200

    ARM: mx3/mx31_3ds: Add support for OTG host mode
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 460d30a329a4186192598131505d9f75e6c5e2bc
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Wed Dec 22 12:25:32 2010 -0200

    ARM: imx/mx25_3ds: Add USB support
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 96cf4239c72af1fa099affc720731bad2f86927b
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Wed Dec 22 12:25:31 2010 -0200

    ARM: imx/mx27_3ds: Add USB OTG support
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 130a0ddad9e8f48250dd0e4a5f35aa8afa9d1c5f
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Wed Dec 22 12:25:30 2010 -0200

    ARM: mx3/mx35_3ds: Add USB OTG Host mode
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 1fef891761ddcbd7e57ec3961a0fb748003222ac
Merge: d3d4b60b12369eded0ea0c5dffee0888ec4d80cd 
1d3f33d541312acd34bd2fa780396d111a0f73b1
Author: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Date:   Mon Jan 3 10:15:11 2011 +0100

    Merge branch 'sgu/mxs-core-v8' of 
git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new

commit 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Mon Jan 3 02:26:53 2011 +0100

    ARM: 6605/1: Add missing include "asm/memory.h"
    
    This patch fixes below build error by adding the missing asm/memory.h,
    which is needed for arch_is_coherent().
    
    $ make pxa3xx_defconfig; make
      CC      init/do_mounts_rd.o
    In file included from include/linux/list_bl.h:5,
                     from include/linux/rculist_bl.h:7,
                     from include/linux/dcache.h:7,
                     from include/linux/fs.h:381,
                     from init/do_mounts_rd.c:3:
    include/linux/bit_spinlock.h: In function 'bit_spin_unlock':
    include/linux/bit_spinlock.h:61: error: implicit declaration of function 
'arch_is_coherent'
    make[1]: *** [init/do_mounts_rd.o] Error 1
    make: *** [init] Error 2
    
    Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
    Acked-by: Peter Huewe <peterhuewe@xxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit d3d4b60b12369eded0ea0c5dffee0888ec4d80cd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:06 2010 +0800

    arm: mx50: add mx50 reference design board support
    
    Add basic function and uart device support.
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 3d5a44be308203a9a192a77037fb613c2f82ed85
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:05 2010 +0800

    arm: mx50: add core functions support except clock
    
    Add core definitions and memory map, gpio, irq, iomux, uart device
    support.
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 02226a20bcfb01322d4a168f2ed6a6e4366796fd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:03 2010 +0800

    arm: mx5: mx51/53 have different mxc_cpu_type definition
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit dca3abf8d071cb78bac8c8f50259e9fe3a81a4bd
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:02 2010 +0800

    arm: mx51: define mx51's own MXC_GPIO_IRQS
    
    mx5 SoCs have different GPIO port count.
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit b086e97b20f150e81609a04ed7da92e12d77f1b0
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:01 2010 +0800

    arm: plat-mxc: add full parameter macro to define gpio port
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 626d90c884591005fdaa9464de81731aab23b864
Author: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
Date:   Thu Dec 30 19:25:00 2010 +0800

    ARM: mx5: use config to define boot related addresses
    
    Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxxxxx>
    Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>

commit 1f42be484ffc5559a29466c82adac7dd472d4439
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Sat Jan 1 12:53:11 2011 +0000

    sparc: remove unused prom tree functions
    
    Remove the following unused funtions:
    prom_nodematch()
    prom_firstprop()
    prom_node_has_property()
    
    Also declare a few local functions static.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a7e4236511c678bf012901faf3c285d199a1adc8
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Sat Jan 1 12:53:10 2011 +0000

    sparc: remove unused prom cpu functions
    
    Remove the following unused funtions:
    prom_stopcpu()
    prom_idlecpu()
    prom_restartcpu()
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit efef2e497717958d9c8bde24998c5a915dd04cd5
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Sat Jan 1 12:53:09 2011 +0000

    sparc: drop prom/palloc.c
    
    None of the functions was used.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 743ceeed277c77a7e6751649ad0c4fa42af8063b
Author: Sam Ravnborg <sam@xxxxxxxxxxxx>
Date:   Sat Jan 1 12:53:08 2011 +0000

    sparc: drop prom/devmap.c
    
    None of the functions was used.
    
    Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 551423748a4eba55f2eb0fc250d757986471f187
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date:   Sun Jan 2 23:02:42 2011 +0000

    watchdog: Improve initialisation error message and documentation
    
    The error message 'NMI watchdog failed to create perf event...'
    does not make it clear that this is a fatal error for the
    watchdog.  It also currently prints the error value as a
    pointer, rather than extracting the error code with PTR_ERR().
    Fix that.
    
    Add a note to the description of the 'nowatchdog' kernel
    parameter to associate it with this message.
    
    Reported-by: Cesare Leonardi <celeonar@xxxxxxxxx>
    Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
    Cc: 599368@xxxxxxxxxxxxxxx
    Cc: 608138@xxxxxxxxxxxxxxx
    Cc: Don Zickus <dzickus@xxxxxxxxxx>
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: <stable@xxxxxxxxxx> # .37.x and later
    LKML-Reference: <1294009362.3167.126.camel@localhost>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit b518a64983cbf2ff31aed530898de2d80e4573d5
Author: Maurus Cuelenaere <mcuelenaere@xxxxxxxxx>
Date:   Sun Jan 2 14:48:16 2011 -0500

    hwmon: (s3c-hwmon) Fix compilation
    
    The owner field was removed from struct attribute in
    6fd69dc578fa0b1bbc3aad70ae3af9a137211707, so don't assign it anymore.
    
    Signed-off-by: Maurus Cuelenaere <mcuelenaere@xxxxxxxxx>
    Signed-off-by: Guenter Roeck <guenter.roeck@xxxxxxxxxxxx>

commit 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Sun Jan 2 22:17:00 2011 +0100

    HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report()
    
    We have a memory leak in 
drivers/hid/hid-picolcd.c::picolcd_debug_out_report()
    in an error path..  We are not always freeing the memory allocated to
    'buff' - this patch makes sure we always kfree() what we allocate with
    kmalloc() when it is no longer needed.
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit 9109f4eb847b7c0be61ae25fb21b1ce2acc9c2d6
Merge: a1a54303d1c58709a0c16402942d6dede2f69f43 
d0dfc6b74a0c6e9ee46b62713256e2b025244d3c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Sun Jan 2 10:44:21 2011 -0800

    Merge branch 'kvm-updates/2.6.37' of 
git://git.kernel.org/pub/scm/virt/kvm/kvm
    
    * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: i8259: initialize isr_ack
      KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow

commit a1a54303d1c58709a0c16402942d6dede2f69f43
Merge: d864b7b4d69d2fd5a3f129d27ad0bb4fc81cc32b 
ea78484bd508d582f543ff727c9a53a381c15895
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Sun Jan 2 10:43:51 2011 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda: Use LPIB quirk for Dell Inspiron m101z/1120
      sound: Prevent buffer overflow in OSS load_mixer_volumes
      ASoC: codecs: wm8753: Fix register cache incoherency
      ASoC: codecs: wm9090: Fix register cache incoherency
      ASoC: codecs: wm8962: Fix register cache incoherency
      ASoC: codecs: wm8955: Fix register cache incoherency
      ASoC: codecs: wm8904: Fix register cache incoherency
      ASoC: codecs: wm8741: Fix register cache incoherency
      ASoC: codecs: wm8523: Fix register cache incoherency
      ASoC: codecs: max98088: Fix register cache incoherency
      ASoC: codecs: Add missing control_type initialization

commit d864b7b4d69d2fd5a3f129d27ad0bb4fc81cc32b
Merge: 3643e0e87c13c670a0fdcd0c34401b38b36ff021 
7ad1227818f09242cfe9bf1845fd24211f5f99bd
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Sun Jan 2 10:37:19 2011 -0800

    Merge branch 'rc-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
    
    * 'rc-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
      kconfig: fix undesirable side effect of adding "visible" menu attribute

commit 15095bb0fe779c0403091bda7adce5fb3bb9ca35
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Sun Jan 2 15:05:21 2011 +0000

    ARM: TWD: enable one-shot mode
    
    Allow one shot timer mode to be used with the TWD.  This allows
    NOHZ mode to be used on SMP systems using the TWD localtimer.
    
    Tested on Versatile Express and U8500.
    
    Tested-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit ea78484bd508d582f543ff727c9a53a381c15895
Merge: e03fa055bc126e536c7f65862e08a9b143138ea9 
776065e36de1d5eb9e33ff908352fef4050ab38d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Sun Jan 2 11:01:55 2011 +0100

    Merge branch 'fix/asoc' into for-linus

commit d0dfc6b74a0c6e9ee46b62713256e2b025244d3c
Author: Avi Kivity <avi@xxxxxxxxxx>
Date:   Fri Dec 31 10:52:15 2010 +0200

    KVM: i8259: initialize isr_ack
    
    isr_ack is never initialized.  So, until the first PIC reset, interrupts
    may fail to be injected.  This can cause Windows XP to fail to boot, as
    reported in the fallout from the fix to
    https://bugzilla.kernel.org/show_bug.cgi?id=21962.
    
    Reported-and-tested-by: Nicolas Prochazka <prochazka.nicolas@xxxxxxxxx>
    Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>

commit 40cd201e37073b3e2281cf2c73fcf5674f22267f
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date:   Sat Jan 1 14:56:18 2011 -0800

    tipc: update log.h re-include protection to reflect new name
    
    The tipc/dbg.h file was recently renamed to tipc/log.h,
    but the re-include define was not updated accordingly.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0885a30b699a2c96d892b61cc48e8ba68fe87bfc
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date:   Fri Dec 31 15:34:27 2010 +0000

    sky2: implement 64 bit stats
    
    This implements 64 bit statistics support and fixes races when reading
    counter values. The PHY counters can only be accessed 16 bits at a time,
    so they are subject to carry races.
    
    NB:
      * TX/RX counters are maintained in software because the the hardware 
packet count
        is only a 32 bit value.
    
      * Error counters are really only 32 bit.
    
      * Old 32 bit counter fields in dev->stats still used for some
        software counters
    
    Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a016892cd6eb8d3dd9769021b088917ac7371abd
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:35 2010 +0000

    tipc: remove extraneous braces from single statements
    
    Cleans up TIPC's source code to eliminate the presence of unnecessary
    use of {} around single statements.
    
    These changes are purely cosmetic and do not alter the operation of TIPC
    in any way.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e3ec9c7d5eea9adf2c604c623c987360cc700b88
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:34 2010 +0000

    tipc: remove zeroing assignments to static global variables
    
    Cleans up TIPC's source code to eliminate the needless initialization
    of static variables to zero.
    
    These changes are purely cosmetic and do not alter the operation of TIPC
    in any way.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2db9983a4318818845193bd577879c0620705e82
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:33 2010 +0000

    tipc: split variable assignments out of conditional expressions
    
    Cleans up TIPC's source code to eliminate assigning values to variables
    within conditional expressions, improving code readability and reducing
    warnings from various code checker tools.
    
    These changes are purely cosmetic and do not alter the operation of TIPC
    in any way.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0e65967e33be61e5f67727edd4ea829b47676fc0
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:32 2010 +0000

    tipc: cleanup various cosmetic whitespace issues
    
    Cleans up TIPC's source code to eliminate deviations from generally
    accepted coding conventions relating to leading/trailing white space
    and white space around commas, braces, cases, and sizeof.
    
    These changes are purely cosmetic and do not alter the operation of TIPC
    in any way.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 25860c3bd5bd1db236d4fd5826d76127d677dc28
Author: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:31 2010 +0000

    tipc: recode getsockopt error handling for better readability
    
    The existing code for the copy to user and error handling at the
    end of getsockopt isn't easy to follow, due to the excessive use
    of if/else.  By simply using return where appropriate, it can be
    made smaller and easier to follow at the same time.
    
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e83504f72456809cdbdbc91700d3ba6370c9da1c
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:30 2010 +0000

    tipc: remove pointless check for NULL prior to kfree
    
    It is acceptable to call kfree() with NULL, so these checks are not
    serving any useful purpose.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:29 2010 +0000

    tipc: remove redundant #includes
    
    Eliminates a number of #include statements that no longer serve any
    useful purpose.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 6e7e309c62ab584348e0fef90c8e3e48f634dba1
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:28 2010 +0000

    tipc: Finish streamlining of debugging code
    
    Completes the simplification of TIPC's debugging capabilities. By default
    TIPC includes no debugging code, and any debugging code added by developers
    that calls the dbg() and dbg_macros() is compiled out. If debugging support
    is enabled, TIPC prints out some additional data about its internal state
    when certain abnormal conditions occur, and any developer-added calls to the
    TIPC debug macros are compiled in.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 8d64a5ba58157dedc61f3f1f51e1c5d66f32a484
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:27 2010 +0000

    tipc: Prune down link-specific debugging code
    
    Eliminates most link-specific debugging code in TIPC, which is now
    largely unnecessary. All calls to the link-specific debugging macros
    have been removed, as are the macros themselves; in addition, the optional
    allocation of print buffers to hold debugging information for each link
    endpoint has been removed. The ability for TIPC to print out helpful
    diagnostic information when link retransmit failures occur has been
    retained for the time being, as an aid in tracking down the cause of
    such failures.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7ced6890bf81d311ab2ea846f92d5f3d0951c08c
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:26 2010 +0000

    tipc: remove dump() and tipc_dump_dbg()
    
    Eliminates calls to two debugging macros that are being completely 
obsoleted,
    as well as any associated debugging routines that are no longer required.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit b29f14284989b3d0b3a5ce268b5b1fc4df9c5795
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:25 2010 +0000

    tipc: remove calls to dbg() and msg_dbg()
    
    Eliminates obsolete calls to two of TIPC's main debugging macros, as well
    as a pair of associated debugging routines that are no longer required.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f5e75269f59f7c3816f23314b924895e4ecf8409
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:24 2010 +0000

    tipc: rename dbg.[ch] to log.[ch]
    
    As the first step in removing obsolete debugging code from TIPC the
    files that implement TIPC's non-debug-related log buffer subsystem
    are renamed to better reflect their true nature.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 5af5479296fba0ace5d5cab84045de5b19bde3fe
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:23 2010 +0000

    tipc: Remove internal linked list of node objects
    
    Eliminates a sorted list TIPC uses to keep track of the neighboring
    nodes it has links to, since this duplicates information already present
    in the internal array of node object pointers.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit b0c1e928c85023c73780b5d9873406ccf1cd8019
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:22 2010 +0000

    tipc: Remove user registry subsystem
    
    Eliminates routines, data structures, and files that make up TIPC's
    user registry. The user registry is no longer needed since the native
    API routines that utilized it no longer exist and there are no longer
    any internal TIPC services that use it.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit aa70200e001fc4d76552c974c94f65ab26020203
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:21 2010 +0000

    tipc: Eliminate use of user registry by topology service
    
    Simplifies TIPC's network topology service so that it no longer registers
    its ports with the user registry, since the service doesn't take advantage
    of any of the registry's capabilities.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7a488fd3d40a127d0d6057ecd2696f39e11e63c3
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:20 2010 +0000

    tipc: Eliminate use of user registry by configuration service
    
    Simplifies TIPC's configuration service so that it no longer registers
    its port with the user registry, since the service doesn't take advantage
    of any of the registry's capabilities.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 8f92df6ad49da958d97e171762d0a97a3dc738f1
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:19 2010 +0000

    tipc: Remove prototype code for supporting multiple clusters
    
    Eliminates routines, data structures, and files that were intended
    to allow TIPC to support a network containing multiple clusters.
    Currently, TIPC supports only networks consisting of a single cluster
    within a single zone, so this code is unnecessary.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 51a8e4dee7653698ba4c6e7de71053665f075273
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:18 2010 +0000

    tipc: Remove prototype code for supporting inter-cluster routing
    
    Eliminates routines and data structures that were intended to allow
    TIPC to route messages to other clusters. Currently, TIPC supports only
    networks consisting of a single cluster within a single zone, so this
    code is unnecessary.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 08c80e9a031df0a8f0269477a32f5eae47d7a146
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:17 2010 +0000

    tipc: Remove prototype code for supporting slave nodes
    
    Simplifies routines and data structures that were intended to allow
    TIPC to support slave nodes (i.e. nodes that did not have links to
    all of the other nodes in its cluster, forcing TIPC to route messages
    that it could not deliver directly through a non-slave node).
    
    Currently, TIPC supports only networks containing non-slave nodes,
    so this code is unnecessary.
    
    Note: The latest edition of the TIPC 2.0 Specification has eliminated
    the concept of slave nodes entirely.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 51f98a8d70583b18cb08b19353aeed5efb0244af
Author: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
Date:   Fri Dec 31 18:59:16 2010 +0000

    tipc: Remove prototype code for supporting multiple zones
    
    Eliminates routines, data structures, and files that were intended
    to allows TIPC to support a network containing multiple zones.
    Currently, TIPC supports only networks consisting of a single cluster
    within a single zone, so this code is unnecessary.
    
    Signed-off-by: Allan Stephens <Allan.Stephens@xxxxxxxxxxxxx>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit aa6027cacdd912ce884953714fcc7392b6155bc6
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Sat Jan 1 05:22:46 2011 +0000

    tg3: fix warnings
    
    In case CONFIG_PM_SLEEP is disabled, we dont need tg3_suspend() and
    tg3_resume().
    
    drivers/net/tg3.c:15056: warning: â??tg3_suspendâ?? defined but not used
    drivers/net/tg3.c:15110: warning: â??tg3_resumeâ?? defined but not used
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Cc: Rafael J. Wysocki <rjw@xxxxxxx>
    Cc: Michael Chan <mchan@xxxxxxxxxxxx>
    Cc: Matt Carlson <mcarlson@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a4f740cf33f7f6c164bbde3c0cdbcc77b0c4997c
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Sat Oct 30 11:49:09 2010 -0400

    of/flattree: Add of_flat_dt_match() helper function
    
    This patch adds of_flat_dt_match() which tests a node for
    compatibility with a list of values and converts the relevant powerpc
    platform code to use it.  This approach simplifies the board support
    code a bit.
    
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Reviewed-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>

commit 77e58efd134b553d723fd963f436920a6aaaa6df
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date:   Fri Dec 31 09:50:31 2010 -0800

    spi/topcliff: Typo fix threhold to threshold
    
    Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit b9556f9a1abdc56a179ac7ba6053469373b6de0f
Author: Julia Lawall <julia@xxxxxxx>
Date:   Wed Dec 29 04:01:03 2010 +0000

    drivers/atm/atmtcp.c: add missing atm_dev_put
    
    The earlier call to atm_dev_lookup increases the reference count of dev,
    so decrease it on the way out.
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression x, E;
    constant C;
    @@
    
    x = atm_dev_lookup(...);
    ... when != false x != NULL
        when != true x == NULL
        when != \(E = x\|x = E\)
        when != atm_dev_put(dev);
    *return -C;
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date:   Thu Dec 30 08:52:29 2010 +0000

    skge: Do not use legacy PCI power management
    
    The skge driver used the legacy PCI power management, and did its
    own PCI callbacks.  Use the same code model as Rafael's changes to
    sky2. Let the PCI subsystem take care of all the PCI-specific aspects of
    device handling during system power transitions.
    
    Compile tested only (so far).
    
    Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
    Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 18c8d82ae5b802c5d82e0dfbcc08b1b568955f46
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Fri Dec 31 12:48:55 2010 -0800

    sfq: fix slot_dequeue_head()
    
    slot_dequeue_head() should make sure slot skb chain is correct in both
    ways, or we can crash if all possible flows are in use.
    
    Jarek pointed out slot_queue_init() can now be done in sfq_init() once,
    instead each time a flow is setup.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit eeaeb068f1393b4db4861481bf594bcd1c3eda7a
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Tue Dec 28 21:53:33 2010 +0000

    sch_sfq: allow big packets and be fair
    
    SFQ is currently 'limited' to small packets, because it uses a 15bit
    allotment number per flow. Introduce a scale by 8, so that we can handle
    full size TSO/GRO packets.
    
    Use appropriate handling to make sure allot is positive before a new
    packet is dequeued, so that fairness is respected.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Acked-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
    Cc: Patrick McHardy <kaber@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f4d5900a99dbc354ef1ba384d445ff80ae4d77b4
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date:   Wed Dec 29 04:26:17 2010 +0000

    starfire: Fix dma_addr_t size test for MIPS
    
    Commit 56543af "starfire: use BUILD_BUG_ON for netdrv_addr_t" revealed
    that the preprocessor condition used to find the size of dma_addr_t
    yielded the wrong result for some architectures and configurations.
    This was kluged for 64-bit PowerPC in commit 3e502e6 by adding yet
    another case to the condition.  However, 64-bit MIPS configurations
    are not detected reliably either.
    
    This should be fixed by using CONFIG_ARCH_DMA_ADDR_T_64BIT, but that
    isn't yet defined everywhere it should be.
    
    Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 824f5f38d3005c346a043dedcfe8b048b699b81a
Author: David Sterba <dsterba@xxxxxxx>
Date:   Wed Dec 29 03:40:31 2010 +0000

    tg3: fix return value check in tg3_read_vpd()
    
    Besides -ETIMEDOUT and -EINTR, pci_read_vpd may return other error
    values like -ENODEV or -EINVAL which are ignored due to the buggy
    check, but the data are not read from VPD anyway and this is checked
    subsequently with at most 3 needless loop iterations. This does not
    show up as a runtime bug.
    
    CC: Matt Carlson <mcarlson@xxxxxxxxxxxx>
    CC: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David Sterba <dsterba@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f7e4c9775ea648deed4a8193951e50d0c7706173
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Fri Dec 31 11:18:48 2010 -0800

    Broadcom CNIC core network driver: fix mem leak on allocation failures in 
cnic_alloc_uio_rings()
    
    We are leaking memory in drivers/net/cnic.c::cnic_alloc_uio_rings() if
    either of the calls to dma_alloc_coherent() fail. This patch fixes it by
    freeing both the memory allocated with kzalloc() and memory allocated with
    previous calls to dma_alloc_coherent() when there's a failure.
    
    Thanks to  Joe Perches <joe@xxxxxxxxxxx>  for suggesting a better
    implementation than my initial version.
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Acked-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2393c944d5d60eedaede80273ede8a816b5fa3e0
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Sun Dec 26 09:59:58 2010 +0000

    ISDN, Gigaset: Fix memory leak in do_disconnect_req()
    
    Hi,
    
    In drivers/isdn/gigaset/capi.c::do_disconnect_req() we will leak the
    memory allocated (with kmalloc) to 'b3cmsg' if the call to alloc_skb()
    fails.
    
    ...
                b3cmsg = kmalloc(sizeof(*b3cmsg), GFP_KERNEL);
        allocation here ------^
                if (!b3cmsg) {
                        dev_err(cs->dev, "%s: out of memory\n", __func__);
                        send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
                        return;
                }
                capi_cmsg_header(b3cmsg, ap->id, CAPI_DISCONNECT_B3, CAPI_IND,
                                 ap->nextMessageNumber++,
                                 cmsg->adr.adrPLCI | (1 << 16));
                b3cmsg->Reason_B3 = CapiProtocolErrorLayer1;
                b3skb = alloc_skb(CAPI_DISCONNECT_B3_IND_BASELEN, GFP_KERNEL);
                if (b3skb == NULL) {
                        dev_err(cs->dev, "%s: out of memory\n", __func__);
                        send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);
                        return;
        leak here ------^
    ...
    
    This leak is easily fixed by just kfree()'ing the memory allocated to
    'b3cmsg' right before we return. The following patch does that.
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Acked-by: Tilman Schmidt <tilman@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0f333d10e3f689640b229c8cf00b16ea51ce4951
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Sun Dec 26 08:44:32 2010 +0000

    sky2: Do not use legacy PCI power management
    
    The sky2 driver uses the legacy PCI power management, so it has to do
    some PCI-specific things in its ->suspend() and ->resume() callbacks,
    which isn't necessary and should better be done by the PCI
    sybsystem-level power management code.  Moreover, it uses
    device_set_wakeup_enable() incorrectly (that function should be
    used when the WoL setting is changed rather than during suspend).
    
    Convert sky2 to the new PCI power management framework and make it
    let the PCI subsystem take care of all the PCI-specific aspects of
    device handling during system power transitions.
    
    Tested on a desktop machine with a Marvell 88E8056 PCI-E adapter.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Acked-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit c866b7eac073198cef03ea6bac2dc978635a9f5c
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Sat Dec 25 12:56:23 2010 +0000

    tg3: Do not use legacy PCI power management
    
    The tg3 driver uses the legacy PCI power management, so it has to do
    some PCI-specific things in its ->suspend() and ->resume() callbacks,
    which isn't necessary and should better be done by the PCI
    sybsystem-level power management code.
    
    Convert tg3 to the new PCI power management framework and make it
    let the PCI subsystem take care of all the PCI-specific aspects of
    device handling during system power transitions.
    
    Tested on HP nx6325 with a NetXtreme BCM5788 adapter.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9f260e0efa4766e56d0ac14f1aeea6ee5eb8fe83
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date:   Sun Dec 26 06:54:53 2010 +0000

    CAN: Use inode instead of kernel address for /proc file
    
    Since the socket address is just being used as a unique identifier, its
    inode number is an alternative that does not leak potentially sensitive
    information.
    
    CC-ing stable because MITRE has assigned CVE-2010-4565 to the issue.
    
    Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
    Acked-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f5260f02e7903bb10e45b1bf3500eab6425edf5c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Sat Dec 25 12:23:42 2010 +0000

    USB: cdc_ether: remove unneeded check
    
    We already verified that "dev->udev->actconfig->extralen" was non-zero
    so "len" is non-zero here as well.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Acked-by: Oliver Neukum <oneukum@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0268102d53c872b42e214f95492065c8058b042e
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Fri Dec 31 11:04:02 2010 -0800

    bnx2: Update firmware and version
    
    Update MIPS firmware to 6.2.1, with improved small packet performance
    in RSS mode, and iSCSI CID allocation bug fix on 5708.
    
    Update driver version to 2.0.21.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a29ba9d2d84889686a3af1c5a6023f28be75ccba
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Fri Dec 31 11:03:14 2010 -0800

    bnx2: Free IRQ before freeing status block memory
    
    When changing ring size, we free all memory including status block
    memory.  If we're in INTA mode and sharing IRQ, the IRQ handler can
    be called and it will reference the NULL status block pointer.
    
    Because of the lockless design of the IRQ handler, there is no simple
    way to synchronize and prevent this.  So we avoid this problem by
    freeing the IRQ handler before freeing the status block memory.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0438a1b24437cf007ed0e0f5f6b414d5b49468dc
Author: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Date:   Fri Dec 31 10:55:38 2010 -0800

    netxen: update module description
    
    This driver supports only Intelligent Ethernet Adapters.
    
    Signed-off-by: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7c14c3f10e6dcd7f70e49f77b6e1ae605c4861e6
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date:   Thu Dec 30 06:27:10 2010 +0000

    dcbnl: cleanup
    
    A couple of small cleanups for patches:
    [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
    [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
    [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
    
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 785b9b1aebcb748fb7627ad4c12dffb7f4f91b55
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date:   Thu Dec 30 06:27:03 2010 +0000

    bnx2x: adding dcbnl support
    
    Adding dcbnl implementation to bnx2x allowing users to manage the
    embedded DCBX engine.
    
    This patch is dependent on the following patches:
    [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
    [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
    [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
    
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Signed-off-by: Eilon Greenstein <eilong@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit ea45fe4e176a42d2396878f530cfdc8265bef37b
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date:   Thu Dec 30 06:26:55 2010 +0000

    dcbnl: adding DCBX feature flags get-set
    
    Adding a pair of set-get routines to dcbnl for setting the negotiation
    flags of the various DCB features. Conforms to the CEE flavor of DCBX
    The user sets these flags (enable, advertise, willing) for each feature
    to be used by the DCBX engine. The 'get' routine returns which of the
    features is enabled after the negotiation.
    
    This patch is dependent on the following patches:
    [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
    [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
    [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
    
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 6241b6259b16aa390ff4bf50f520685b3801200b
Author: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
Date:   Thu Dec 30 06:26:48 2010 +0000

    dcbnl: adding DCBX engine capability
    
    Adding an optional DCBX capability and a pair for get-set routines for
    setting the device DCBX mode. The DCBX capability is a bit field of
    supported attributes. The user is expected to set the DCBX mode with a
    subset of the advertised attributes.
    
    This patch is dependent on the following patches:
    [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes
    [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers
    [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers
    
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Acked-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 96b99684e365f28d49bdb1221ca022b75cb91a98
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date:   Thu Dec 30 09:26:37 2010 +0000

    net_dcb: add application notifiers
    
    DCBx applications priorities can be changed dynamically. If
    application stacks are expected to keep the skb priority
    consistent with the dcbx priority the stack will need to
    be notified when these changes occur.
    
    This patch adds application notifiers for the stack to register
    with.
    
    Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9ab933ab2cc80f04690d6aa385b1110075c5e507
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date:   Thu Dec 30 09:26:31 2010 +0000

    dcbnl: add appliction tlv handlers
    
    This patch adds application tlv handlers. Networking stacks
    may use the application priority to set the skb priority of
    their stack using the negoatiated dcbx priority.
    
    This patch provides the dcb_{get|set}app() routines for the
    stack to query these parameters. Notice lower layer drivers
    can use the dcbnl_ops routines if additional handling is
    needed. Perhaps in the firmware case for example
    
    Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
    Signed-off-by: Shmulik Ravid <shmulikr@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 3e29027af43728c2a91fe3f735ab2822edaf54a8
Author: John Fastabend <john.r.fastabend@xxxxxxxxx>
Date:   Thu Dec 30 09:25:46 2010 +0000

    dcbnl: add support for ieee8021Qaz attributes
    
    The IEEE8021Qaz is the IEEE standard version of CEE. The
    standard has had enough significant changes from the CEE
    version that many of the CEE attributes have no meaning
    in the new spec or do not easily map to IEEE standards.
    
    Rather then attempt to create a complicated mapping
    between CEE and IEEE standards this patch adds a nested
    IEEE attribute to the list of DCB attributes. The policy
    is,
    
        [DCB_ATTR_IFNAME]
        [DCB_ATTR_STATE]
        ...
        [DCB_ATTR_IEEE]
                [DCB_ATTR_IEEE_ETS]
                [DCB_ATTR_IEEE_PFC]
                [DCB_ATTR_IEEE_APP_TABLE]
                        [DCB_ATTR_IEEE_APP]
                        ...
    
    The following dcbnl_rtnl_ops routines were added to handle
    the IEEE standard,
    
        int (*ieee_getets) (struct net_device *, struct ieee_ets *);
        int (*ieee_setets) (struct net_device *, struct ieee_ets *);
        int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
        int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
        int (*ieee_getapp) (struct net_device *, struct dcb_app *);
        int (*ieee_setapp) (struct net_device *, struct dcb_app *);
    
    Signed-off-by: John Fastabend <john.r.fastabend@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit bfcf72e4426da2fd8f8081a641385ffc3ccc2282
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date:   Fri Dec 31 02:22:22 2010 -0600

    [SCSI] libiscsi: use bh locking instead of irq with session lock
    
    The session lock is taken in threads, timers, and bottom halves
    like softirqs and tasklets. All the code but
    iscsi_conn/session_failure take the session lock with the spin_lock_bh
    call. This was done because I thought some offload drivers
    would be calling these functions from a irq. They never did,
    so this patch has iscsi_conn/session_failure use the bh
    locking.
    
    Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit f41d472179a0d7c8e8160c85180ab1124947068e
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date:   Fri Dec 31 02:22:21 2010 -0600

    [SCSI] libiscsi: do not take host lock in queuecommand
    
    iscsi_tcp, ib_iser, cxgb*, be2iscsi and bnx2i do not use
    the host lock and do not take the session lock against
    a irq, so this patch drops the DEF_SCSI_QCMD use. Instead
    we just take the session lock and disable bhs.
    
    Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 1227633a441363642cdbaf38c4241d071e917095
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date:   Fri Dec 31 02:22:20 2010 -0600

    [SCSI] be2iscsi: fix null ptr when accessing task hdr
    
    If alloc_pdu fails then the task->hdr pointer may not be
    set. This adds a check for this case in the cleanup callback.
    
    Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit bc7accec8788ada4f459461194c2b8fad94ed239
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date:   Fri Dec 31 02:22:19 2010 -0600

    [SCSI] be2iscsi: fix gfp use in alloc_pdu
    
    The pdu allication callout is called from a spin lock
    and in the IO path so we cannot use GFP_KERNEL. This
    has the driver use GFP_ATOMIC.
    
    Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit df4da5cdfca05b37b366b9c69925b68586969c1c
Author: Mike Christie <michaelc@xxxxxxxxxxx>
Date:   Fri Dec 31 02:22:18 2010 -0600

    [SCSI] libiscsi: add more informative failure message during iscsi scsi eh
    
    This adds a more informative error code and message
    for the iscsi scsi eh session drop paths. This allows
    you to distinguish if the session was dropped due to
    a connection failure vs the iscsi layer dropping
    the session due to scsi eh failure processing.
    
    Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 5c10007560589a2335a77cbc92347b1474518296
Author: Julia Lawall <julia@xxxxxxx>
Date:   Wed Dec 29 15:57:54 2010 +0100

    [SCSI] gdth: Add missing call to gdth_ioctl_free
    
    Add missing call to gdth_ioctl_free before aborting.
    
    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @@
    expression buf,ha,len,addr,E;
    @@
    
    buf = gdth_ioctl_alloc(ha, len, FALSE, &addr)
    ... when != false buf != NULL
        when != true buf == NULL
        when != \(E = buf\|buf = E\)
        when != gdth_ioctl_free(ha, len, buf, addr)
    *return ...;
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@xxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 9d1da730ee17e712c25c0b1e51653048f92d2385
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date:   Sun Dec 26 10:23:58 2010 -0300

    [media] DVB: IR support for TechnoTrend CT-3650
    
    Based on Waling Dijkstra's discovery that the IR works the same as
    on the TT-1500, this patch has been rewritten to fit with the
    rc_core infrastructure.
    
    Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ebce9a3331f4dd1f39856dc4b79f539eb25f7f64
Author: Igor M. Liplianin <liplianin@xxxxx>
Date:   Fri Dec 31 02:04:38 2010 -0300

    [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
    
    For example  boot up with two CAM inserted.
    
    Signed-off-by: Abylay Ospan <aospan@xxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 21d33014108671cc6b02feda088f32bf26ce532d
Author: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Date:   Wed Dec 29 19:48:43 2010 -0300

    [media] ir-nec-decoder: fix repeat key issue
    
    Fixing the problem with NEC protocol and repeating keys under the following
    circumstances. The problem occurs when there is a repeat code without
    properly decoded scancode. This leads to repeat the wrong (last decoded)
    scancode.
    
    An example from real life:
    I am pressing volume down, then several minutes later i am pressing
    volume up, but the real scancode is wrongly decoded and only a repeat
    event is emitted, so as a result volume is going down while i am holding
    volume up button.
    
    The patch fixes above problem using rc_keyup timeout (as pointed by Mauro).
    It just prevents key repeats if they appear after rc_keyup.
    
    Signed-off-by: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 8f4bfadd200477acb6dcf41a45919dd37d01a6db
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date:   Sun Dec 26 21:50:10 2010 -0800

    [SCSI] bfa: remove unused defintions and misc cleanups
    
    This patch removes unused functions, data strucutres, and definitions.  It
    also includes misc comment and formatting cleanups.
    
    Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 2f2f40a45845e52fbbe07bcd3e09ccff44feb01b
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date:   Sun Dec 26 21:48:53 2010 -0800

    [SCSI] bfa: remove inactive functions
    
    This patch removes some inactive functions and macros.
    
    Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit d4b671c58ebeb56dfc8fe8bcca25e0a06bc9359a
Author: Jing Huang <huangj@xxxxxxxxxxx>
Date:   Sun Dec 26 21:46:35 2010 -0800

    [SCSI] bfa: replace bfa_assert with WARN_ON
    
    Signed-off-by: Jing Huang <huangj@xxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 2f263d9d4f0432e4f7a708c95fab82f83ec14947
Author: Justin P. Mattock <justinmattock@xxxxxxxxx>
Date:   Thu Dec 30 15:07:51 2010 -0800

    spi/dw_spi Typo change diable to disable.
    
    Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit ef98a2c0f2856f6b2aa87fd32d5b192afaeae518
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Thu Dec 30 15:23:41 2010 -0300

    [media] staging: se401 depends on USB
    
    Fix build errors by adding "depends on USB":
    
    ERROR: "usb_register_driver" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_alloc_urb" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_submit_urb" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_control_msg" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_free_urb" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_kill_urb" [drivers/staging/se401/se401.ko] undefined!
    ERROR: "usb_deregister" [drivers/staging/se401/se401.ko] undefined!
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 798cf3144f8b7466533cf738740478e472677a01
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Thu Dec 30 15:23:38 2010 -0300

    [media] staging: usbvideo/vicam depends on USB
    
    Fix build errors by adding "depends on USB":
    
    ERROR: "usb_register_driver" [drivers/staging/usbvideo/vicam.ko] undefined!
    ERROR: "usb_bulk_msg" [drivers/staging/usbvideo/vicam.ko] undefined!
    ERROR: "usb_control_msg" [drivers/staging/usbvideo/vicam.ko] undefined!
    ERROR: "usb_deregister" [drivers/staging/usbvideo/vicam.ko] undefined!
    ERROR: "usb_get_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_put_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_free_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_submit_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_set_interface" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_kill_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_register_driver" [drivers/staging/usbvideo/usbvideo.ko] 
undefined!
    ERROR: "usb_deregister" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    ERROR: "usb_alloc_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined!
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 96e442c1b2ef2ba9476e5da2607ba666ce09664d
Author: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Date:   Thu Dec 2 07:43:37 2010 -0300

    [media] soc_camera: Add the ability to bind regulators to soc_camedra 
devices
    
    In certain machines, camera devices are supplied directly
    by a number of regulators. This patch add the ability to drive
    these regulators directly by the soc_camera driver.
    
    Signed-off-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3153ac9c6208892ee237caccdbe2290f8247e236
Author: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
Date:   Thu Dec 2 11:53:28 2010 -0300

    [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 
sensor
    
    Signed-off-by: Alberto Panizzo <maramaopercheseimorto@xxxxxxxxx>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b6a633c18ba83c0c8e96759a31d356bfb77e2b5f
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Sat Dec 25 17:40:26 2010 -0300

    [media] v4l: soc-camera: switch to .unlocked_ioctl
    
    Use the V4L mutex infrastructure in soc-camera core and drivers and switch 
to
    .unlocked_ioctl.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c85bb69af09988f728aca825c11267c9d06ba32e
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Thu Dec 30 08:37:06 2010 -0300

    [media] v4l: ov772x: simplify pointer dereference
    
    Use a more direct way to obtain a pointer to struct ov772x_priv, where the
    subdevice is available.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 63c9718c1a4595d51f5b70ed4aed6cee5aea875b
Author: David Cohen <dacohen@xxxxxxxxx>
Date:   Wed Dec 8 09:13:59 2010 -0300

    [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
    
    OmniVision OV9640 driver wasn't requesting properly its private data
    on I2C remove and video_probe functions. It was retrieving the V4L2
    subdev struct address instead of priv struct's one. This patch fixes
    such problem.
    
    Signed-off-by: David Cohen <dacohen@xxxxxxxxx>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f7b74f76a3a5bcad4d2e8db76834253a63977545
Author: David Cohen <dacohen@xxxxxxxxx>
Date:   Wed Dec 8 09:13:58 2010 -0300

    [media] ov9640: use macro to request OmniVision OV9640 sensor private data
    
    This cleanup patch creates macro to request OmniVision OV9640 private
    data, which increases readability.
    
    Signed-off-by: David Cohen <dacohen@xxxxxxxxx>
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3643e0e87c13c670a0fdcd0c34401b38b36ff021
Merge: e983dc2428164698571e1dd1b25c4322181adbac 
cc6455f82edd3f9da3b03870d41cde3cb22ad40d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 30 12:09:26 2010 -0800

    Merge branch 'drm-intel-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel
    
    * 'drm-intel-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
      drm/i915/dvo: Report LVDS attached to ch701x as connected
      Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
      drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
      drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
      drm/i915/sdvo: Add hdmi connector properties after initing the connector
      drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.

commit e983dc2428164698571e1dd1b25c4322181adbac
Author: Nitin Gupta <ngupta@xxxxxxxxxx>
Date:   Thu Dec 30 04:07:58 2010 -0500

    Revert "Staging: zram: work around oops due to startup ordering snafu"
    
    This reverts commit 7e24cce38a99f373450db67bf576fe73e8168d66 because it
    was never appropriate for mainline.
    
    Do not check for init flag before starting I/O - zram module is unusable
    without this fix.
    
    The oops mentioned in the reverted commit message was actually a problem
    only with the zram version as present in project's own repository where
    we allocate struct zram_stats_cpu upon device initialization.  OTOH, In
    mainline/staging version of zram, we allocate struct stats upfront, so
    this oops cannot happen in mainline version.
    
    Checking for init_done flag in zram_make_request() results in a *no-op*
    for any I/O operation since we simply always return success.  This flag
    is actually set when the first write occurs on a zram disk which
    triggers its initialization.
    
    Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=25722
    
    Reported-by: Dennis Jansen <dennis.jansen@xxxxxx>
    Signed-off-by: Nitin Gupta <ngupta@xxxxxxxxxx>
    Cc: Anton Blanchard <anton@xxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit ff20f1779b7f60a9682aa8d62f8ca3b650e4c360
Merge: ebb76ce16daf6908dc030dec1c00827d37129fe5 
0bc463426ab5eb39e76df637b29a4f191d01b8a0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 30 10:07:44 2010 -0800

    Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
    
    * 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
      spi/m68knommu: Coldfire QSPI platform support
      spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode 
transition

commit ebb76ce16daf6908dc030dec1c00827d37129fe5
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Date:   Wed Dec 29 14:07:11 2010 -0800

    memcg: fix wrong VM_BUG_ON() in try_charge()'s mm->owner check
    
    At __mem_cgroup_try_charge(), VM_BUG_ON(!mm->owner) is checked.
    But as commented in mem_cgroup_from_task(), mm->owner can be NULL
    in some racy case. This check of VM_BUG_ON() is bad.
    
    A possible story to hit this is at swapoff()->try_to_unuse(). It passes
    mm_struct to mem_cgroup_try_charge_swapin() while mm->owner is NULL. If we
    can't get proper mem_cgroup from swap_cgroup information, mm->owner is used
    as charge target and we see NULL.
    
    Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
    Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
    Reported-by: Hugh Dickins <hughd@xxxxxxxxxx>
    Reported-by: Thomas Meyer <thomas@xxxxxxxx>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
    Reviewed-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit b83be6f20a0e468f715b14225c9f897538dfe5ad
Author: Christoph Hellwig <hch>
Date:   Thu Dec 16 12:04:54 2010 +0100

    update Documentation/filesystems/Locking
    
    Mostly inspired by all the recent BKL removal changes, but a lot of older
    updates also weren't properly recorded.
    
    Signed-off-by: Christoph Hellwig <hch@xxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 9804ed9e840c461f88b290dea43173e3eed37102
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 11:58:37 2010 -0300

    [media] ivtv-i2c: Fix two warnings
    
    Fix two gcc warnings:
    
    drivers/media/video/ivtv/ivtv-i2c.c:170: warning: cast from pointer to 
integer of different size
    drivers/media/video/ivtv/ivtv-i2c.c:171: warning: cast from pointer to 
integer of different size
    $ gcc --version
    gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-48)
    
    They seem bogus, but, as the original code also has problems with
    LE/BE, just change its implementation to be clear.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit abfd013b665d21f57bc4b2e455b23c4cece0df9f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 09:51:19 2010 -0300

    [media] staging/lirc: Update lirc TODO files
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 6a23a520c07ba556ea2317b1f72f3d2eb002f991
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 09:05:12 2010 -0300

    [media] cx88: Remove the obsolete i2c_adapter.id field
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d7c7235695ef9cbbdc20bdeb8554dbf10f576ca1
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 22:49:50 2010 -0300

    [media] lirc_zilog: Remove use of deprecated struct i2c_adapter.id field
    
    Remove use of deprecated struct i2c_adapter.id field.  In the process,
    perform different detection of the HD PVR's Z8 IR microcontroller versus
    the other Hauppauge cards with the Z8 IR microcontroller.
    
    Also added a comment about probe() function behavior that needs to be
    fixed.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a9cd591e29b6b50e1212de7b7a86ccd270f5c2a6
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 22:47:46 2010 -0300

    [media] ir-kbd-i2c: Add HD PVR IR Rx support to ir-kbd-i2c
    
    Add HD PVR IR Rx support to ir-kbd-i2c
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ea6c06033f01216df504b0f337a350778a3bc80e
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 22:46:13 2010 -0300

    [media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip
    
    Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either
    lirc_zilog or ir-kbd-i2c to use.  This is a required step in removing
    lirc_zilog's use of the deprecated struct i2c_adapter.id field.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 41ca2b1ac269e2ed64e2562b91fa61cab0b19e7a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 08:37:33 2010 -0300

    [media] Remove staging/lirc/lirc_i2c driver
    
    This driver duplicates the same functionality found at ir-kbd-i2c.
    There were a few missing key parsers that were added by the previous
    patches. The only thing left on lirc_i2c driver is the IR parsing
    for Asus TV-Box and Creative/VisionTek BreakOut-Box.
    Those devices use pcf8574 chip for IR.
    
    They are old video adapters with TV tuners. Their code were never
    merged upstream, and they are not chipped anymore. So, it is very
    unlikely that someone would have interests on porting them to the
    Linux Kernel.
    
    Due to that, let's remove lirc_i2c, as all the remaining functionality
    are already mapped via ir-kbd-i2c.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 8a6334fc91de3f58bbd3051d6f088e7f71a3becd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 10:25:12 2010 -0300

    [media] ivtv-i2c: Don't use IR legacy mode for Zilog IR
    
    The Zilog IR entries are already handled by IR new code. So,
    remove its usage from the legacy IR support.
    
    Acked-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e1e2c57565635310209566a31a300e593f74cc22
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 08:31:10 2010 -0300

    [media] ivtv: Add Adaptec Remote Controller
    
    lirc-i2c implements a get key logic for the Adaptec Remote
    Controller, at address 0x6b. The only driver that seems to have
    an Adaptec device is ivtv:
    
    $ git grep -i adaptec drivers/media
    drivers/media/video/cs53l32a.c: * cs53l32a (Adaptec AVC-2010 and AVC-2410) 
i2c ivtv driver.
    drivers/media/video/cs53l32a.c: * Audio source switching for Adaptec 
AVC-2410 added by Trev Jackson
    drivers/media/video/cs53l32a.c:   /* Set cs53l32a internal register for 
Adaptec 2010/2410 setup */
    drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2410 card */
    drivers/media/video/ivtv/ivtv-cards.c:    { PCI_DEVICE_ID_IVTV16, 
IVTV_PCI_ID_ADAPTEC, 0x0093 },
    drivers/media/video/ivtv/ivtv-cards.c:    .name = "Adaptec VideOh! 
AVC-2410",
    drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2010 card */
    drivers/media/video/ivtv/ivtv-cards.c:    { PCI_DEVICE_ID_IVTV16, 
IVTV_PCI_ID_ADAPTEC, 0x0092 },
    drivers/media/video/ivtv/ivtv-cards.c:    .name = "Adaptec VideOh! 
AVC-2010",
    drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2410         7 
/* Adaptec AVC-2410 */
    drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2010         8 
/* Adaptec AVD-2010 (No Tuner) */
    drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_PCI_ID_ADAPTEC           
      0x9005
    drivers/media/video/ivtv/ivtv-driver.c:            "\t\t\t 8 = Adaptec 
AVC-2410\n"
    drivers/media/video/ivtv/ivtv-driver.c:            "\t\t\t 9 = Adaptec 
AVC-2010\n"
    drivers/media/video/ivtv/ivtv-i2c.c:              0x6b,   /* Adaptec IR */
    
    There are two Adaptec cards defined there, but AVC-2010 doesn't have a
    remote controller. So, the logic at lirc_i2c seems to be for Adaptec 
AVC-2410.
    
    As we'll remove lirc_i2c from kernel, move the getkey code to ivtv driver, 
and
    use it for AVC-2410.
    
    Reviewed-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Acked-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1c0eb0ffb0d541bf05a4b422a629fa5986799313
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 08:02:51 2010 -0300

    [media] cx88: Add RC logic for Leadtek PVR 2000
    
    Currently, lirc-i2c has a decoding logic for Leadtek Remote
    Control. Move it to cx88, as we intend to remove lirc-i2c.
    
    For now, initialize LIRC remote keytable with RC_MAP_EMPTY, as
    we don't know its keymap yet. It would be nice to later check
    if is there any file on LIRC userspace with that keytable.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b22374544b981b82f7319a02e6b718fc796e9cfa
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Dec 30 08:01:01 2010 -0300

    [media] bttv-input: Add a note about PV951 RC
    
    When comparing lirc-i2c and ir-kbd-i2c/bttv-input logic, a difference
    was noticed. As lirc-i2c will be removed soon, store the difference on
    a comment inside ir-kbd-i2c, in order to preserve the knowledge we
    have about that remote controller.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 8c11a94d86eb5489dc665bc566bf624e329d89fa
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 19:40:40 2010 +0000

    ARM: mmci: Clean up MMCI announcement printk
    
    Make the MMCI announcement printk say which primecell part number
    has been found.  Display the revision as an unsigned decimal, and
    display only the first 8 hex digits of the base address unless it's
    larger.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit cc6455f82edd3f9da3b03870d41cde3cb22ad40d
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 30 12:54:00 2010 +0000

    drm/i915/dvo: Report LVDS attached to ch701x as connected
    
    As we have already detected something attached to the chip during
    initialisation, always report the LVDS connector status as connected
    during probing.
    
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

commit bcfbbce822d219eb587acaba8a6e062bbeae4761
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 30 09:07:15 2010 +0000

    Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks"
    
    As I feared, whilst this fixed the clocks for the Lenovo U160, it broke
    many other machines. So lets reverts commit 448f53a1ede54eb854d036abf
    and search for the real bug.
    
    Reported-and-tested-by: Travis Hume <travis@xxxxxxxxxxxxxxx> [et al]
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

commit e03fa055bc126e536c7f65862e08a9b143138ea9
Author: Daniel T Chen <crimsun@xxxxxxxxxx>
Date:   Tue Dec 28 17:20:02 2010 -0500

    ALSA: hda: Use LPIB quirk for Dell Inspiron m101z/1120
    
    Sjoerd Simons reports that, without using position_fix=1, recording
    experiences overruns. Work around that by applying the LPIB quirk
    for his hardware.
    
    Reported-and-tested-by: Sjoerd Simons <sjoerd@xxxxxxxxxx>
    Cc: <stable@xxxxxxxxxx>
    Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
    Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

commit d81a12bc29ae4038770e05dce4ab7f26fd5880fb
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date:   Sat Dec 25 16:23:40 2010 -0500

    sound: Prevent buffer overflow in OSS load_mixer_volumes
    
    The load_mixer_volumes() function, which can be triggered by
    unprivileged users via the SOUND_MIXER_SETLEVELS ioctl, is vulnerable to
    a buffer overflow.  Because the provided "name" argument isn't
    guaranteed to be NULL terminated at the expected 32 bytes, it's possible
    to overflow past the end of the last element in the mixer_vols array.
    Further exploitation can result in an arbitrary kernel write (via
    subsequent calls to load_mixer_volumes()) leading to privilege
    escalation, or arbitrary kernel reads via get_mixer_levels().  In
    addition, the strcmp() may leak bytes beyond the mixer_vols array.
    
    Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
    Cc: stable <stable@xxxxxxxxxx>
    Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

commit c1955b5f3a95717ce1f5235f6e9968da068e3183
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Sat Dec 18 16:30:48 2010 +0100

    x86: Use this_cpu_inc_return for nmi counter
    
    this_cpu_inc_return() saves us a memory access there.
    
    Reviewed-by: Pekka Enberg <penberg@xxxxxxxxxx>
    Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
    Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
    Acked-by: Tejun Heo <tj@xxxxxxxxxx>
    Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 7b543a5334ff4ea2e3ad3b777fc23cdb8072a988
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Sat Dec 18 16:30:05 2010 +0100

    x86: Replace uses of current_cpu_data with this_cpu ops
    
    Replace all uses of current_cpu_data with this_cpu operations on the
    per cpu structure cpu_info.  The scala accesses are replaced with the
    matching this_cpu ops which results in smaller and more efficient
    code.
    
    In the long run, it might be a good idea to remove cpu_data() macro
    too and use per_cpu macro directly.
    
    tj: updated description
    
    Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Acked-by: H. Peter Anvin <hpa@xxxxxxxxx>
    Acked-by: Tejun Heo <tj@xxxxxxxxxx>
    Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 0a3aee0da4402aa19b66e458038533c896fb80c6
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Sat Dec 18 16:28:55 2010 +0100

    x86: Use this_cpu_ops to optimize code
    
    Go through x86 code and replace __get_cpu_var and get_cpu_var
    instances that refer to a scalar and are not used for address
    determinations.
    
    Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Acked-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
    Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 56f4c400349157289b474a3fd49ee96acab0a4d7
Merge: 32ae2ade462146729580117d9886cc9efd83dfbe 
da169f5df2764a6a937cb3b07562e269edfb1c0e
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Thu Dec 30 11:26:45 2010 +0100

    Merge branch 'core' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core

commit 61ea3aa5bf309333c6655ccef825b4a765bff219
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 14:38:44 2010 -0300

    [media] timblogiw: fix compile warning
    
    Fix 64-bit compile warning:
    
    drivers/media/video/timblogiw.c: In function â??timblogiw_dma_filter_fnâ??:
    drivers/media/video/timblogiw.c:151: warning: cast from pointer to integer 
of different size
    drivers/media/video/timblogiw.c: In function â??timblogiw_openâ??:
    drivers/media/video/timblogiw.c:670: warning: cast to pointer from integer 
of different size
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Cc: Richard Rojförs <richard.rojfors@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 657f2271050beabe725ba101c1d840f51a41f33d
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 14:29:55 2010 -0300

    [media] v4l: fix handling of v4l2_input.capabilities
    
    The v4l core sets the v4l2_input.capabilities field based on the supplied
    v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the 
v4l2_input
    struct, thus overwriting that field incorrectly.
    
    Either remove the memset (which is already done by the v4l core), or add the
    proper capabilities field in case of a memcpy.
    
    The same is also true for v4l2_output, but that only affected the ivtv 
driver.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3ea2b673a55cee528f83653e711d09425ed4d8b6
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 14:28:13 2010 -0300

    [media] em28xx: fix incorrect s_ctrl error code and wrong call to res_free
    
    Calling subdevs to handle s_ctrl returned a non-zero return code even if
    everything went fine.
    
    Calling STREAMOFF if no STREAMON happened earlier would hit a BUG_ON
    in res_free.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 02ac04805e6a753610d7dd1716181ccbd8e366af
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 14:27:05 2010 -0300

    [media] v4l2-ctrls: only check def for menu, integer and boolean controls
    
    The 'def' field is only valid for menus, integers and booleans.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 513521eaee4375a1a0da0b73c7131a165a9fe4d9
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 14:25:52 2010 -0300

    [media] v4l2-ctrls: use const char * const * for the menu arrays
    
    This prevents checkpatch warnings generated when defining
    'static const char *foo[]' arrays. It makes sense to use
    const char * const * anyway since the pointers in the array
    are indeed const.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Wed Dec 29 13:53:21 2010 -0300

    [media] usbvision: coding style
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 52cb0bf275debe4ec8950157f11b9d9f14447a88
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sun Dec 19 20:33:51 2010 -0300

    [media] usbvision: convert // to /* */
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5490a7cbe65d63c6ec45f1013287af1e390c95d7
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sun Dec 19 20:21:36 2010 -0300

    [media] usbvision: get rid of camelCase
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c627b9d1f580f26fe99a8045d37a57f91e9aef66
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 18 11:06:09 2010 -0300

    [media] usbvision: convert to unlocked_ioctl
    
    Convert driver to use core-assisted locking.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a6d38f889750ed6290728a19d9dad577b147c6d0
Author: Ping Cheng <pinglinux@xxxxxxxxx>
Date:   Fri Dec 24 13:16:53 2010 -0800

    Input: wacom_w8001 - support pen or touch only devices
    
    Not all penabled devices support touch. The same holds true for touch
    devices, so we should be setting up devices according to the results
    returned when we query the hardware.
    
    Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 0bc463426ab5eb39e76df637b29a4f191d01b8a0
Author: Jate Sujjavanich <jsujjavanich@xxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Sep 29 09:44:32 2010 -0400

    spi/m68knommu: Coldfire QSPI platform support
    
    After grabbing a msg from the msgq, the mcfqspi_work function calls
    list_del_init on the mcfqspi->msgq which unintentionally deletes the rest
    of the list before it can be processed. If qspi call was made using
    spi_sync, this can result in a process hang.
    
    Signed-off-by: Jate Sujjavanich <jsujjavanich@xxxxxxxxxxxxxxxxxxxxxx>
    Acked-by: Steven King <sfking@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 477ca3ad6ac5cdbd5bd40941fc22c6eedc9aa90d
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date:   Wed Dec 1 17:29:18 2010 +0800

    spi/fsl_espi: change the read behaviour of the SPIRF
    
    The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the
    amount of data in the receive FIFO, so read the SPIRF byte by byte when
    the data in receive FIFO is less than 4 bytes.
    
    On Simics, when read N bytes that exceed the amout of data in receive
    FIFO, we can't read the data out, that is we can't clear the rx FIFO,
    then the CPU will loop on the espi rx interrupt.
    
    Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 73930a85cf38d72851305fcf640c07b4c13aa405
Author: Rob Herring <rob.herring@xxxxxxxxxxx>
Date:   Wed Nov 17 17:50:23 2010 -0600

    of_serial: explicitly include of_irq.h
    
    On PPC, of_irq.h gets implicitly included, but on other platforms
    it does not.
    
    Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit fe14042358fac0673d4b6362a73796fd64379938
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date:   Thu Nov 18 15:55:02 2010 -0800

    of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
    
    unflatten_device_tree has two dependencies on things that happen
    during boot time.  Firstly, it references the initial device tree
    directly. Secondly, it allocates memory using the early boot
    allocator.  This patch factors out these dependencies and uses
    the new __unflatten_device_tree function to implement a driver-visible
    fdt_unflatten_tree function, which can be used to unflatten a
    blob after boot time.
    
    V2:
    - remove extra __va() call
    - make dt_alloc functions return void *.  This doesn't fix the general
      strangeness in this code that constantly casts back and forth between
      unsigned long and __be32 *
    
    Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 57d00ecf90cc9854973da2960012b734acc26e51
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date:   Thu Nov 18 15:55:01 2010 -0800

    of/flattree: Reorder unflatten_dt_node
    
    Move unflatten_dt_node to be grouped with non-__init functions.
    
    Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit a40d6c4cf12d87980c10b230df435d0f56adc40b
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date:   Thu Nov 18 15:55:00 2010 -0800

    of/flattree: Refactor unflatten_dt_node
    
    unflatten_dt_node is a helper function that does most of the work to
    convert a device tree blob into tree of device nodes.  This code
    now uses a passed-in blob instead of using the single boot-time blob,
    allowing it to be called in more contexts.
    
    Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 9706a36e35c4ce04f28a62cfe1205b4e3b0dd13c
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date:   Thu Nov 18 15:54:59 2010 -0800

    of/flattree: Add non-boottime device tree functions
    
    In preparation for providing run-time handling of device trees, factor
    out some of the basic functions so that they take an arbitrary blob,
    rather than relying on the single boot-time tree.
    
    V2:
    - functions have of_fdt_* names
    - removed find_flat_dt_string
    - blob argument is first
    
    Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit e6ce1324e4f08b0d984340201a125806dae0e9a6
Author: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
Date:   Thu Nov 18 15:54:56 2010 -0800

    of/flattree: Add Kconfig for EARLY_FLATTREE
    
    The device tree code is now in two pieces: some which can be used 
generically
    on any platform which selects CONFIG_OF_FLATTREE, and some early which is 
used
    at boot time on only a few architectures.  This patch segregates the early
    code so that only those architectures which care about it need compile it.
    This also means that some of the requirements in the early code (such as
    a cmd_line variable) that most architectures (e.g. X86) don't provide
    can be ignored.
    
    Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xxxxxxxxxx>
    [grant.likely@xxxxxxxxxxxx: remove extra blank line addition]
    [grant.likely@xxxxxxxxxxxx: fixed incorrect #ifdef CONFIG_EARLY_FLATTREE 
check]
    [grant.likely@xxxxxxxxxxxx: Made OF_EARLY_FLATTREE select instead of depend
                                on OF_FLATTREE]
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 7ad1227818f09242cfe9bf1845fd24211f5f99bd
Author: Jan Beulich <JBeulich@xxxxxxxxxx>
Date:   Thu Dec 9 08:11:38 2010 +0000

    kconfig: fix undesirable side effect of adding "visible" menu attribute
    
    This lead to non-selected, non-user-selectable options to be written
    out to .config. This is not only pointless, but also preventing the
    user to be prompted should any of those options eventually become
    visible (e.g. by de-selecting the *_AUTO options the "visible"
    attribute was added for.
    
    Furthermore it is quite logical for the "visible" attribute of a menu
    to control the visibility of all contained prompts, which is what the
    patch does.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 42ce7fd6319bed8ecb26d656c476365da46b29e9
Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
Date:   Wed Dec 29 11:52:53 2010 +0100

    spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode 
transition
    
    When SPI wake up from OFF mode, CS is in the wrong state: force it to the
    inactive state.
    
    During the system life, I monitored the CS behavior using a oscilloscope.
    I also activated debug in omap2_mcspi, so I saw when driver disable the 
clocks
    and restore context when device is not used.Each time the CS was in the 
correct
    state.  It was only when system was put suspend to ram with off-mode 
activated
    that on resume the CS was in wrong state( ie activated).
    
    Changelog:
    * Change from v1 to v2:
      - Rebase on linus/master (after 2.6.37-rc1)
      - Do some clean-up and fix indentation on both patches
      - Add more explanations for patch 2
    
    * Change from v2 to v3:
      - Use directly resume function of spi_master instead of using function
      - from spi_device as Grant Likely pointed it out.
      - Force this transition explicitly for each CS used by a device.
    
    * Change from v3 to v4:
      - Patch clean-up according to Kevin Hilman and checkpatch.
      - Now force CS to be in inactive state only if it was inactive when it was
        suspended.
    
    * Change from v4 to v5:
      - Rebase on linus/master (after 2.6.37-rc3)
      - Collapse some lines as pointed by Grant Likely
      - Fix a spelling
    
    * Change from v5 to v6:
      - Rebase on linus/master (after 2.6.37-rc7)
      - Use CONFIG_SUSPEND instead of CONFIG_PM
      - Didn't use legacy PM methods anymore. Instead, add a struct dev_pm_ops 
and
        add the resume method there.
      - Fix multi-line comment style
    
    * Change from v6 to v7:
      - Rebase on linus/master (after 2.6.37-rc8)
      - Drop an extra line
    
    Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
    Acked-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
    Reviewed-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 60ebe1568fd15b7ffa101acc645069e27d546ed6
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date:   Fri Dec 3 20:35:50 2010 +0530

    ux500: add TC35893 keypad platform data
    
    Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 09c730a488c32c2cadb31cdb8dcc4df528441197
Author: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
Date:   Tue Dec 21 15:53:31 2010 +0530

    input/tc3589x: add tc3589x keypad support
    
    Add support for the keypad controller module found on the
    TC3589X devices. This driver default adds the support for
    TC35893 device.
    
    Signed-off-by: Sundar Iyer <sundar.iyer@xxxxxxxxxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    [Some minor fixups for compilation]
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 4ef9e11d6867f88951e30db910fa015300e31871
Author: Hillf Danton <dhillf@xxxxxxxxx>
Date:   Wed Dec 29 21:55:28 2010 +0800

    fix freeing user_struct in user cache
    
    When racing on adding into user cache, the new allocated from mm slab
    is freed without putting user namespace.
    
    Since the user namespace is already operated by getting, putting has
    to be issued.
    
    Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
    Acked-by: Serge Hallyn <serge@xxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 96aebafa63418f447ddc823e40da341cc40553dd
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Fri Dec 24 21:28:56 2010 +0100

    gen_init_cpio: Avoid race between call to stat() and call to open()
    
    In usr/gen_init_cpio.c::cpio_mkfile() a call to stat() is made based on
    pathname, subsequently the file is open()'ed and then the value of the
    initial stat() call is used to allocate a buffer. This is not safe since
    the file may change between the call to stat() and the call to open().
    Safer to just open() the file and then do fstat() using the filedescriptor
    returned by open.
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Acked-by: Jeff Garzik <jgarzik@xxxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit cd8d60a20a4516016c117ac0f1ac7b06ff606f7e
Author: Theodore Ts'o <tytso@xxxxxxx>
Date:   Fri Dec 24 09:42:10 2010 -0500

    kbuild: create linux-headers package in deb-pkg
    
    Create a linux-headers-$KVER.deb package which can be used to build
    external modules without having the source tree around.
    
    Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 649497d1a3676020802ebba04a3d9bb31253adb5
Author: Avi Kivity <avi@xxxxxxxxxx>
Date:   Tue Dec 28 12:09:07 2010 +0200

    KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow
    
    We use the physical address instead of the base gfn for the four
    PAE page directories we use in unpaged mode.  When the guest accesses
    an address above 1GB that is backed by a large host page, a BUG_ON()
    in kvm_mmu_set_gfn() triggers.
    
    Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=21962
    Reported-and-tested-by: Nicolas Prochazka <prochazka.nicolas@xxxxxxxxx>
    KVM-Stable-Tag.
    Signed-off-by: Avi Kivity <avi@xxxxxxxxxx>

commit 427aacfe1d0c540bf80e5243d18ba1272f9b756f
Author: Dmitri Belimov <d.belimov@xxxxxxxxx>
Date:   Tue Dec 28 21:49:07 2010 -0300

    [media] tm6000: Fix mutex unbalance
    
    Hi
    
    Fix never unlocked mutex. No more crash after removing USB stick.
    
    With my best regards, Dmitry.
    
    Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit aa777a88b2d73f710b86b955e0c738af91e9e452
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:39:13 2010 -0300

    [media] gspca - sonixj: Bad clock for om6802 in 640x480
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 71e84ea7f082eb02df6ef40f55d2c4a998f6e1df
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:35:27 2010 -0300

    [media] gspca - stv06xx/st6422: Use the new video control mechanism
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7e5f9059a807ce9b7a12b2402f5aeae9557c8049
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:24:18 2010 -0300

    [media] gspca - vc032x: Cleanup source
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7fbee99aa2c73bdf47add9de58f646fa7713e7e5
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:17:40 2010 -0300

    [media] gspca - zc3xx: The sensor of the VF0250 is a GC0303
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 49fb5e60f7e907126aac10af6577fac6fde684f6
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:09:34 2010 -0300

    [media] gspca - zc3xx: Use the new video control mechanism
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7d55a84b0af47b2ec55e16c6dbc8df62a72ac749
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:02:32 2010 -0300

    [media] gspca - zc3xx: Keep sorted the device table
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2bbf53bd176e36d1574eeec53bf710d94703535e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 07:01:04 2010 -0300

    [media] gspca: Bad comment
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0aeb5ec74b0a95f1699040f0262a6fd5507d6e8f
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 06:59:04 2010 -0300

    [media] gspca - pac7302/pac7311: Fix some warnings
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d85185902fb669a92d4934b926f8016368e1ad06
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Tue Dec 28 06:55:01 2010 -0300

    [media] gspca - main: Fix some warnings
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 66832aef0694807f487a8ccc8871cea4e80d78c5
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Mon Dec 27 12:27:50 2010 -0300

    [media] bt819: the ioctls in the header are internal to the kernel
    
    Remove bt819.h from ioctl-number.txt and make a note in the header
    that these ioctls are for internal use only.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b9218f2f15cdff8991ba041993bf40962c49fdd0
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Mon Dec 27 12:22:46 2010 -0300

    [media] saa6588: rename rds.h to saa6588.h
    
    The naming of the media/rds.h header suggested that it was a generic
    RDS header, when in fact it is just a saa6588 module API that is
    internal to the kernel.
    
    Rename the header and the struct and defines in it to make this clear.
    
    Also removed the header include in radio-si470x.h (not used anymore)
    and from ioctl-number.txt (it's internal to the kernel and never called
    from userspace).
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a519d70e0cf346e946202ffcbeaf57a1748d0c03
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date:   Fri Nov 19 15:41:49 2010 -0300

    [media] media: video: pvrusb2: fix memory leak
    
    Use put_device() instead of kfree() because of device name leak.
    
    Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
    Acked-by: Mike Isely <isely@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9028f58f5d7e810a0e88b508ebe6a69daf7e3273
Author: Alexey Chernov <4ernov@xxxxxxxxx>
Date:   Mon Dec 6 17:09:53 2010 -0300

    [media] support of GoTView PCI-E X5 3D Hybrid in cx23885
    
    Some comments:
    1. Everything initialize properly except radio.
    2. All analog inputs (TV, composite, S-Video) are tested by myself in 
several
    TV norms (SECAM-D, PAL, NTSC), everything work fine.
    
    So the patch adds general support/detection of the card with working analog
    part, DVB part is not supported for now.
    
    Signed-off-by: Alexey Chernov <4ernov@xxxxxxxxx>
    Reviewed-by: Steven Toth <stoth@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5f63306d82131371f464c0e5b7ebe6a23a84c768
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Mon Dec 27 21:04:58 2010 -0300

    [media] cx231xx: use bitwise negate instead of logical
    
    Bitwise negate was intended here.  INPUT_SEL_MASK is 0x30.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Oct 25 17:51:15 2010 -0300

    [media] em28xx: Fix audio input for Terratec Grabby
    
    The audio input line was wrong. Fix it.
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b5fff5445a077af897e670e98ea54b9b440f8b63
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Dec 28 08:13:50 2010 -0300

    [media] cardlist: Update lists for em28xx and saa7134
    
    PS.: The cardlists are auto-generated via scripts.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b7a0f2e793a52b306e682a0e2e9a0b6f0f0a730e
Author: Ramiro Morales <ramiro@xxxxxxxxxxxx>
Date:   Sun Dec 26 18:13:30 2010 -0300

    [media] saa7134: Add support for Compro VideoMate Vista M1F
    
    Signed-off-by: Pavel Osnova <pvosnova@xxxxxxxxx>
    Signed-off-by: Ramiro Morales <ramiro@xxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 44c6e2a7c2ec76dd495a0f330f9beac572a2fdd7
Author: Ang Way Chuang <wcang@xxxxxxxxxxxxxx>
Date:   Fri Dec 24 02:40:46 2010 -0300

    [media] cx88-dvb.c: DVB net latency using Hauppauge HVR4000
    
    A Hauppauge HVR 4000 is used on a School On Internet Asia (SOI Asia)
    project in order to carry IP traffic over ULE. However, there is an
    issue with high latency jitter.
    
    My boss, Husni, identified the problem and provided a patch for it.
    
    The default buffer size of 32 TS frames on cx88 causes the high latency,
    so our deployment changes that to 6 TS frames. This patch made the
    buffer size tunable, while keeping the default buffer size of 32 TS
    frames unchanged.
    
    Signed-off-by: Achmad Husni Thamrin <husni@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit fe04164647588ec55937e6d696da1ebeca04d000
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Thu Dec 23 16:38:53 2010 -0300

    [media] cx231xxx: fix typo in saddr_len check
    
    The original code compared "saddr_len" with zero twice in a nonsensical
    way.  I asked the list, and Andy Walls and Sri Deevi say that the second
    check should be if "saddr_len == 1".
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Srinivasa Deevi <Srinivasa.deevi@xxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 50155c25bf346b65fec8e215131df397b0a5ee6e
Author: Anatolij Gustschin <agust@xxxxxxx>
Date:   Wed Dec 22 17:31:59 2010 -0300

    [media] fsl_viu: add VIDIOC_QUERYSTD and VIDIOC_G_STD support
    
    VIDIOC_QUERYSTD and VIDIOC_G_STD ioctls are currently not
    supported in the FSL VIU driver. The decoder subdevice
    driver saa7115 extended by previous patch supports QUERYSTD
    for saa711x, so we add the appropriate ioctls to the VIU
    driver to be able to determine the video input's standard.
    
    Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f9d7d787842e92bc768d282f37fc3056c5441ddb
Author: Anatolij Gustschin <agust@xxxxxxx>
Date:   Wed Dec 22 17:31:58 2010 -0300

    [media] saa7115: allow input standard autodetection for more chips
    
    Autodetect input's standard using field frequency detection
    feature (FIDT in status byte at 0x1F) of the chips saa7111/
    saa7111a/saa7113/saa7114/saa7118.
    
    Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 641d21167f66ef4c574ef4f586fec0ae32179acd
Author: Dmitri Belimov <d.belimov@xxxxxxxxx>
Date:   Wed Dec 22 05:57:46 2010 -0300

    [media] tm6000: rework and fix IR
    
    Hi
    
    This patch didn't kill Stefan's remotes and just for upload my good part of 
code.
    1. Add some code for show IR activity
    2. Add filter for IR remotes
    3. Split remotes to different types.
    4. Fix stop interrupt pipe when isoc pipe started.
    
    When we decide general way of IR I'll add support our remotes.
    For our customers I'll made custom temporary patch without this part.
    
    Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit db9285f79b12286a3b525b41ab275796679c1dfa
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date:   Mon Dec 27 15:45:19 2010 -0300

    [media] MEDIA: RC: Provide full scancodes for TT-1500 remote control
    
    Add 0x15 prefix to scancodes for TT-1500 remote control.
    
    Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 730726a6f90740a5954ca2fb1c74fad6f44a2c42
Author: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
Date:   Mon Dec 27 15:41:58 2010 -0300

    [media] DVB: Set scanmask for Budget/SAA7146 cards
    
    These devices do not return the full command+address, so set
    scanmask accordingly.
    
    Signed-off-by: David Henningsson <david.henningsson@xxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2d5ca76f2b39a31313d7e54224c78b7b311e7dce
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 18:17:12 2010 -0300

    [media] dabusb: Move it to staging to be deprecated
    
    dabusb driver were conceived as an experimental driver for a test
    device. The driver never supported any shipped product, and, while
    there were some updates on it in 2003, for an ancient product,
    those changes were never submitted upstream.
    
    Also, there's no DocBook for its API, nor any upstream discussion.
    
    So, better to remove it, on .39. If later needed, we may rescue it
    from git logs. For now, let's move it to staging.
    
    Acked-by: Deti Fliegl <deti@xxxxxxxxx>
    Cc: Deti Fliegl <deti@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0170f6bcb243cb9e86c953652f8e62fccb8108f1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 13:00:04 2010 -0300

    [media] streamzap: Fix a compilation warning when compiled builtin
    
    drivers/media/rc/streamzap.c: In function â??streamzap_probeâ??:
    drivers/media/rc/streamzap.c:460:2: warning: statement with no effect
    
    Cc: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 465a9e3a2f494b0887db63b7b10bb9370145d9bc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 12:58:02 2010 -0300

    [media] af9013: Fix a compilation warning
    
    drivers/media/dvb/frontends/af9013.c: In function 
â??af9013_update_signal_strength.clone.0â??:
    drivers/media/dvb/frontends/af9013.c:967:6: warning: â??retâ?? may be used 
uninitialized in this function
    
    Cc: Antti Palosaari <crope@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 187e7d3b9b4e0b6b1c171846592e679e58a84cd2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 12:16:47 2010 -0300

    [media] stv090x: Fix some compilation warnings
    
    A few typos at the driver are causing the following warnings:
    
    drivers/media/dvb/frontends/stv090x.c: In function 
â??stv090x_start_searchâ??:
    drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between 
â??enum stv090x_searchâ?? and â??enum stv090x_delsysâ??
    drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between 
â??enum stv090x_searchâ?? and â??enum stv090x_delsysâ??
    drivers/media/dvb/frontends/stv090x.c: In function 
â??stv090x_optimize_trackâ??:
    drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value â??4â?? 
not in enumerated type â??enum stv090x_delsysâ??
    
    The first two are due to the lack of using the delsys types
        STV090x_DVBS1/STV090x_DSS
    instead of
        STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS
    
    The second one is due to the usage of STV090x_UNKNOWN (enum 
stv090x_modulation)
    instead of STV090x_ERROR (enum stv090x_delsys).
    
    Cc: Manu Abraham <abraham.manu@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 95f18be2e4f74255b46fcc23a9718cca9c7375c9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 12:00:03 2010 -0300

    [media] gspca: Fix a warning for using len before filling it
    
    The check for status errors is now before the check for len. That's
    ok. However, the error printk's for the status error prints the URB
    length. This generates this error:
    
    drivers/media/video/gspca/gspca.c: In function â??fill_frameâ??:
    drivers/media/video/gspca/gspca.c:305:9: warning: â??lenâ?? may be used 
uninitialized in this function
    
    The fix is as simple as moving the len init to happen before the checks.
    
    Cc: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2e94b53c55d00b4d4d4b9e65007566f7fbffab7a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 11:55:07 2010 -0300

    [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K
    
    Fixes several warnings:
    
    drivers/media/dvb/frontends/dib7000m.c: In function 
â??dib7000m_set_channelâ??:
    drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value â??255â?? 
not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value â??255â?? 
not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000m.c: In function â??dib7000m_tuneâ??:
    drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value 
â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value 
â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value 
â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000p.c: In function 
â??dib7000p_set_channelâ??:
    drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value â??255â?? 
not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value â??255â?? 
not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000p.c: In function â??dib7000p_tuneâ??:
    drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value â??255â?? 
not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value 
â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
    drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value 
â??255â?? not in enumerated type â??fe_transmit_mode_tâ??
    
    The drivers were prepared to support 4K carriers, but as the define were 
added
    later, they were using a "magic" value of 255.
    
    Cc: Patrick Boettcher <pb@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d78aa7292ad38b22ccb9cdba99293cedb52fb342
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 11:47:17 2010 -0300

    [media] lirc_zilog: Fix a warning
    
    drivers/staging/lirc/lirc_zilog.c: In function â??send_codeâ??:
    drivers/staging/lirc/lirc_zilog.c:886:1: warning: label â??doneâ?? defined 
but not used
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit fce50ac80e38b1d205939ff7d4777536701263a6
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 11:44:50 2010 -0300

    [media] radio-wl1273: Fix two warnings
    
    drivers/media/radio/radio-wl1273.c: In function 
â??wl1273_fm_upload_firmware_patchâ??:
    drivers/media/radio/radio-wl1273.c:675:2: warning: â??nâ?? may be used 
uninitialized in this function
    drivers/media/radio/radio-wl1273.c:675:2: warning: â??iâ?? may be used 
uninitialized in this function
    
    Those vars are never initialized, and the debug message makes no sense, as 
it
    will show just two random values.
    
    Cc: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9ae2ae35f8a8a13997b9ec719ae7c151a2182e80
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 11:41:14 2010 -0300

    [media] dmxdev: Fix a compilation warning due to a bad type
    
    drivers/media/dvb/dvb-core/dmxdev.c: In function 
â??dvb_dmxdev_start_feedâ??:
    drivers/media/dvb/dvb-core/dmxdev.c:583:13: warning: comparison between 
â??enum dmx_ts_pesâ?? and â??enum <anonymous>â??
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1035758d5bdcd6c2f7308a35185f1d6f3b6b5443
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 11:14:52 2010 -0300

    [media] feature_removal_schedule.txt: mark VIDIOC_*_OLD ioctls to die
    
    There are some old broken definitions of ioctl's, where the
    read/write arguments were marked wrong. The last one were added
    on 2.6.6 kernel. Remove them, in order to cleanup some
    copy_from_user/copy_to_user logic done inside V4L core.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0334c8a52a8578f7aef501a14f78004f931efe20
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 09:41:05 2010 -0300

    [media] staging/lirc: Fix compilation when LIRC=m
    
    drivers/staging/lirc/lirc_bt829.c:141: undefined reference to 
`lirc_register_driver'
    drivers/built-in.o:(.rodata+0x20f68): undefined reference to 
`lirc_dev_fop_read'
    drivers/built-in.o:(.rodata+0x20f7c): undefined reference to 
`lirc_dev_fop_poll'
    drivers/built-in.o:(.rodata+0x20f8c): undefined reference to 
`lirc_dev_fop_open'
    drivers/built-in.o:(.rodata+0x20f94): undefined reference to 
`lirc_dev_fop_close'
    drivers/built-in.o:(.rodata+0x21030): undefined reference to 
`lirc_dev_fop_open'
    drivers/built-in.o:(.rodata+0x21038): undefined reference to 
`lirc_dev_fop_close'
    
    This happens when .config is like:
        CONFIG_LIRC=m
        CONFIG_IR_LIRC_CODEC=m
        CONFIG_LIRC_STAGING=y
        CONFIG_LIRC_BT829=y
    
    Don't allow that.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 22efe507705a8437255114f98d0d514524460be0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 08:30:34 2010 -0300

    [media] omap_vout: Remove an obsolete comment
    
    This comment mentions a field that doesn't exist, and talks about
    videodev.h that got removed. So, it doesn't make any sense to keep
    it.
    
    Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 55fe25b418640fad04190103274841b2c907bacd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 08:27:05 2010 -0300

    [media] Remove the old V4L1 v4lgrab.c file
    
    This example file uses the old V4L1 API. It also doesn't use libv4l.
    So, it is completely obsolete. A good example already exists at
    v4l-utils (v4l2grab.c):
        http://git.linuxtv.org/v4l-utils.git
    
    Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1fb03673b9eddb55a08174d0952c0a1c2438997e
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 08:24:58 2010 -0300

    [media] Fix videodev.h references at the V4L DocBook
    
    Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 38af87869e7a255b6ba0f41bf53d2e7b0a54d13b
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 08:13:12 2010 -0300

    [media] Documentation/ioctl/ioctl-number.txt: Remove some now freed ioctl 
ranges
    
    The V4L1 removal patches removed a few ioctls. Update it at the docspace.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 07:47:54 2010 -0300

    [media] V4L1 removal: Remove linux/videodev.h
    
    There's no sense on keeping it on 2.6.38, as nobody is using it
    anymore, at the kernel tree, and installing it at the userspace
    API.
    
    As two deprecated drivers still need it, move it to their internal
    directories.
    
    Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 58c66df3e38ffb1d59cc5162bb9e07c859288034
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 07:38:48 2010 -0300

    [media] Remove VIDEO_V4L1 Kconfig option
    
    There's no sense on keeping VIDEO_V4L1 Kconfig option just because of
    two deprecated drivers moved to staging scheduled to die on 2.6.39.
    
    Reviewed-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 27 07:33:41 2010 -0300

    [media] staging: Add TODO files for se401 and usbvideo/vicam
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ddda424999817fbc17adf9013feb066903382ede
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Sun Dec 19 21:59:56 2010 -0300

    [media] ivtv: Return EFAULT when copy_from_user() fails in 
ivtv_write_vbi_from_user()
    
    If write() on a VBI device node fails due to a bad buffer pointer from
    userspace, we should notify the application properly with EFAULT, per the
    V4L2 API spec.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b0c45686c8e8aecc7b0cd04d9b6af48d74418d53
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Sat Dec 18 10:48:17 2010 -0300

    [media] ivtv: ivtv_write_vbi() should use copy_from_user() for user data 
buffers
    
    ivtv_write_vbi() is used for both VBI data that came from the
    driver internally and VBI data that came from the user.  However,
    it did not use copy_from_user() for reading the VBI data from the
    user buffers.
    
    This change adds a new version of the function,
    ivtv_write_vbi_from_user(), that uses copy_from_user() to read the VBI
    data provided via user buffers.
    
    This should resolve a sparse build warning reported by Dave Gilbert.
    
    Reported-by: Dr. David Alan Gilbert <linux at treblig.org>
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 754f9969c323559a12bce1475f3c1e6574129856
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Sat Dec 11 20:38:20 2010 -0300

    [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream
    
    The cx18_stream struct contained a struct cx18_dvb for
    every stream object, most of which were for analog capture.
    Now we only allocate the cx18_dvb object for the DTV TS stream.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit fa98447f09641adeeaf02b94133649f03b74d159
Author: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
Date:   Sat Dec 11 12:31:45 2010 -0300

    [media] ivtv, cx18: Make ioremap failure messages more useful for users
    
    The error messages these drivers emitted for ioremap() failures
    were misleading and not helpful for users.  Reworded those messages
    to help the user take action to resolve vmalloc address space
    exhaustion.
    
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0a58d713062fb49952b9b082514a48a0c83b269d
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 08:01:38 2010 -0300

    [media] stk-webcam: remove V4L1 compatibility code, replace with V4L2 
controls
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 439105b122dfa21fbce7201d0f30b5eeac95c918
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:46:56 2010 -0300

    [media] feature-removal: update V4L1 removal status
    
    While the V4L1 compatibility module has been removed, we still have
    two V4L1 drivers that prevent full V4L1 removal.
    
    Those drivers have been moved to staging and will be removed in 2.6.39,
    together with the last V4L1 support.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 39c3d488452ae206cfc8afda0db041ee55d01c3c
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:44:33 2010 -0300

    [media] cpia, stradis: remove deprecated V4L1 drivers
    
    Nobody stepped in to convert these drivers to V4L2, so they are now
    removed from the kernel.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:36:55 2010 -0300

    [media] se401: deprecate driver, move to staging
    
    The se401 driver is deprecated and is moved to staging. If no one will
    convert this driver to V4L2, then it will be removed in 2.6.39.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 745da4280f272840976d47afba22ed853f07e1b2
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:27:47 2010 -0300

    [media] usbvideo: deprecate the vicam driver
    
    Move usbvideo to staging and mark it deprecated.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5772dcaa790851ec068afcd0d1f160d801b1126e
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:20:34 2010 -0300

    [media] usbvideo: remove deprecated drivers
    
    Remove ibmcam, konicawc and ultracam drivers. There are replaced by
    gspca drivers.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:15:22 2010 -0300

    [media] documentation: update some files to reflect the V4L1 compat removal
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 41d9931c5ae014fbab8bf612c70b8e7ff16f4641
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 07:04:16 2010 -0300

    [media] videobuf-dma-sg: remove obsolete comments
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Sat Dec 25 06:58:01 2010 -0300

    [media] zoran: remove V4L1 compat code and zoran custom ioctls
    
    All the functionality is now handled through V4L2.
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 08af245de0cf6ab5f4ed008ee2bb99273774fce0
Author: Hans Verkuil <hverkuil@xxxxxxxxx>
Date:   Fri Dec 24 10:33:19 2010 -0300

    [media] V4L: remove V4L1 compatibility mode
    
    Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b69a219e0e97441dbeb0262cf85468b61a161399
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 14:01:42 2010 -0300

    [media] gspca - ov534_9: Remove an useless instruction
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7a5a414ccb5bfc0fe277ef1a0e9d1e492a6f083c
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:58:45 2010 -0300

    [media] gspca - ov519: Bad detection of some ov7670 sensors
    
    Tested-by: jim smyth <jsmyth1969@xxxxxxxxx>
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 668f44a603dd4b3468cecd7d8d6dc525207db94e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:46:14 2010 -0300

    [media] gspca: Use the global error status for get/set streamparm
    
    Also, in ov534, don't check the parm type.
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 76ebc16b87592350e4ea70681855171adf73f055
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:22:21 2010 -0300

    [media] gspca - main: Check the isoc packet status before its length
    
    When an error is set for an isochronous packet, the length of the packet
    may be null. In this case, the error was not detected and the image
    was not discarded as it should be.
    
    Reported-by: Franck Bourdonnec <fbourdonnec@xxxxxxxx>
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f2c5d92ecd4c69a4f86e76d19cb7663f2ebf4781
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:19:59 2010 -0300

    [media] gspca - sq930x: Fix a bad comment
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit efd3769269f2ef9a0ad452ea8298b3edcb2f5a62
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:11:54 2010 -0300

    [media] gspca - sq930x: Some detected sensors are not handled yet
    
    These are OmniVision's OV7660 and OV9630.
    Don't register the webcam when they are found.
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3ebd17946448df50b9082412d09955c87a112721
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Dec 25 13:07:57 2010 -0300

    [media] gspca - sq930x: Don't register a webcam when there are USB errors
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 634b4770539de63581ccdb554426547ced6ded01
Author: Theodore Kilgore <kilgota@xxxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 17:06:04 2010 -0300

    [media] gspca - sq905c: Adds the Lego Bionicle
    
    This patch adds the Vendor:Product number of the Lego Bionicle camera to
    the existing gspca/sq905c.c and also a line for the camera in gspca.txt.
    The camera works "out of the box" with these small changes. So this is
    just in time for Christmas. Think of the children.
    
    Signed-off-by: Theodore Kilgore <kilgota@xxxxxxxxxx>
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a19a5cd7b328ae457f79092e711d4bd888e1ca50
Author: Pete Eberlein <pete@xxxxxxxxxxxx>
Date:   Mon Dec 20 19:18:59 2010 -0300

    [media] s2255drv: remove BKL
    
    Remove BKL ioctl and use unlocked_ioctl with core-assisted locking instead.
    
    Signed-off-by: Pete Eberlein <pete@xxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 07e80305babb27a332ce0f04a3c38ce495cbe711
Author: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Date:   Mon Dec 20 14:39:25 2010 -0300

    [media] v4l: mem2mem_testdev: remove BKL usage
    
    Remove usage of BKL by usign per-device mutex.
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
    CC: Pawel Osciak <pawel@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit dcd745b723efc875ec5a8f44be028bd0704b12d6
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Mon Dec 20 09:53:16 2010 -0300

    [media] timblogiw: too large value for strncpy()
    
    This is a copy and paste error.  It should be using sizeof(cap->driver)
    instead of sizeof(cap->card).
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Cc: Richard Rojförs <richard.rojfors@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ef330dc2e794c932fcbde3f8abd3f12780d78b47
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Sat Dec 18 19:05:02 2010 -0300

    [media] saa7164: Remove pointless conditional and save a few bytes in 
saa7164_downloadfirmware()
    
    Hi,
    
    release_firmware() just does nothing if passed a NULL pointer. So there's
    no reason to test before the call in
    saa7164-fw.c::saa7164_downloadfirmware().
    
    Removing the pointless conditional also saves a few bytes.
    before:
       text    data     bss     dec     hex filename
       7943     112    2144   10199    27d7 
drivers/media/video/saa7164/saa7164-fw.o
    after:
       text    data     bss     dec     hex filename
       7931     112    2136   10179    27c3 
drivers/media/video/saa7164/saa7164-fw.o
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Cc: Steven Toth <stoth@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 10304ca65f8871ad9f6725a7480522034184f55f
Author: Sam Doshi <sam@xxxxxxxxxxxxxxxx>
Date:   Sat Dec 18 12:58:54 2010 -0300

    [media] drivers:media:dvb: add USB PIDs for Elgato EyeTV Sat
    
    Adds USB PIDs for the Elgato EyeTV Sat device.
    This device is a clone of the Terratec S7.
    
    Signed-off-by: Sam Doshi <sam@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c3353330508aee4390442df2d7f6ce0ef5006185
Author: Anatolij Gustschin <agust@xxxxxxx>
Date:   Fri Dec 17 06:40:50 2010 -0300

    [media] media: fsl-viu: fix support for streaming with mmap method
    
    Streaming using mmap didn't work in the VIU driver. We need to
    start/stop DMA in streamon/streamoff and free the buffers on
    release. Add appropriate driver extension now.
    
    Signed-off-by: Anatolij Gustschin <agust@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2a72b39e516bf772e707d5a080d5d07b1c8ac0c0
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Fri Dec 10 09:39:34 2010 -0300

    [media] zoran: bit-wise vs logical and
    
    zr->frame_num is a counter and && was intended here instead of &.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 75aecc3af22ae9063c96457d530f281a1e2d3276
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date:   Tue Dec 7 19:49:24 2010 -0300

    [media] DM04/QQBOX Frontend attach change
    
    On Fri, 2010-12-03 at 09:32 -0200, Mauro Carvalho Chehab wrote:
    > Em 27-11-2010 11:13, Malcolm Priestley escreveu:
    > > Driver Version v1.73 - Frontend attach change.
    > > To stop double rc registration in multi tuner environment or firmware 
change.
    > >
    > > Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    > >
    > >
    > > +static int lme_name(struct dvb_usb_adapter *adap)
    > > +{
    > > +       struct lme2510_state *st = adap->dev->priv;
    > > +       const char *desc = adap->dev->desc->name;
    > > +       char *fe_name[] = {"", " LG TDQY-P001F", " SHARP:BS2F7HZ7395"};
    > > +       char *name = adap->fe->ops.info.name;
    > > +
    > > +       strcpy(name, desc);
    > > +       strcat(name, fe_name[st->tuner_config]);
    >
    > Please use, instead, strlcpy/strlcat, to avoid writing outside the buffer 
size.
    >
    
    Driver Version v1.74
    Amended patch with change to strlcpy/strlcat.
    
    Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c59a9bfabfc2a6359f046652c6bfa0a82fb17a05
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Tue Dec 7 15:50:09 2010 -0300

    [media] media: fix em28xx build, needs hardirq.h
    
    Fix em28xx build by adding hardirq.h header file:
    
    drivers/media/video/em28xx/em28xx-vbi.c:49: error: implicit declaration of 
function 'in_interrupt'
    
    Reported-by: Zimny Lech <napohybelskurwysynom2010@xxxxxxxxx>
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 4c8b8698053c986f5f5249878eab70cb028a1023
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date:   Fri Nov 26 14:06:35 2010 -0300

    [media] rc: ir-lirc-codec: fix potential integer overflow
    
    'n' may be bigger than MAX_INT*sizeof(int), if so checking of truncated
    (int)(n/sizeof(int)) for LIRCBUF_SIZE overflow and then using nontruncated 
'count'
    doesn't make sense.  Also n may be up to sizeof(int)-1 bytes bigger than 
expected,
    so check value of (n % sizeof(int)) too.
    
    Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 87d1a50ce45168cbaec10397e876286a398052c1
Author: Matti Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Date:   Fri Dec 10 11:41:34 2010 -0300

    [media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver
    
    This module implements V4L2 controls for the Texas Instruments
    WL1273 FM Radio and handles the communication with the chip.
    
    Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 383268a8e282fb549dabe3a33ccafc9434ab6006
Author: Matti Aaltonen <matti.j.aaltonen@xxxxxxxxx>
Date:   Fri Dec 10 11:41:33 2010 -0300

    [media] MFD: WL1273 FM Radio: MFD driver for the FM radio
    
    This is the core of the WL1273 FM radio driver, it connects
    the two child modules. The two child drivers are
    drivers/media/radio/radio-wl1273.c and sound/soc/codecs/wl1273.c.
    
    The radio-wl1273 driver implements the V4L2 interface and communicates
    with the device. The ALSA codec offers digital audio, without it only
    analog audio is available.
    
    Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@xxxxxxxxx>
    Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 00765f16f116b45aa67de306ac923ed4ba262bf9
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Sun Dec 12 15:55:03 2010 -0300

    [media] gspca_sonixb: Add support for 0c45:602a
    
    Add support for cameras with the HV7131D sensor, such as the 0c45:602a
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2b3e284a89dfa53eb42b6470e4c03e5ddfdb24c5
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Sun Dec 12 08:55:04 2010 -0300

    [media] gspca_sonixb: Rewrite start of frame detection
    
    Our old start of frame detection code wrongly assumes that the sof
    marker always lives at the beginning of the frame. At least for the
    0c45:602a camera this is not the case. This patch also improves
    the framerate from 28 fps to 30 fps with the 0c45:6005 and 0c45:6007
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d6746d55da0819edbe913a1447b1ab0e7b440241
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Fri Dec 10 12:28:15 2010 -0300

    [media] gspca_sonixb: Make sonixb handle 0c45:6007 instead of sn9c102
    
    I've a 0c45:6007 camera and it works fine with the gspca_sonixb driver,
    so make that handle it instead of the deprecated sn9c102 driver.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 788e5d4dc825ffc2eb863272d9a57fb93490dd92
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Dec 17 14:47:27 2010 -0300

    [media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybrid
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 12007419b766b316998499bd07c6586928230729
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Dec 17 14:39:29 2010 -0300

    [media] Add a keymap for Pixelview 002-T remote
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e330289ed40f76819d6a13e682203c6fc9a86304
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Dec 17 14:22:09 2010 -0300

    [media] cx231xx: Fix inverted bits for RC on PV Hybrid
    
    At Pixelview SBTVD Hybrid, the bits sent by the IR are inverted. Due to 
that,
    the existing keytables produce wrong codes.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 49aefd2bcda80d33497f0f26702c67e372cacef3
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date:   Mon Nov 22 23:35:17 2010 -0300

    [media] timblogiw: const and __devinitdata do not mix
    
    This fixes the following error in PowerPC builds:
    
    drivers/media/video/timblogiw.c: In function 'timblogiw_probe':
    drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a 
section type conflict
    
    Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d162e7aac24bfd8b96881582368f976e7e464c25
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Dec 7 19:39:33 2010 -0300

    [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor
    
    Support for mt9m001 (mi1300) is broken:
        - Table is incomplete;
        - Only one resolution is currently supported by the driver;
        - Resolution is incomplete;
        - it complains about broken JPEG headers.
    
    Use the same init found on em28xx driver, and properly report the
    output format as 8-bits GRAY.
    
    Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d4b416f26279bbbe07faaff1c9cd19d6b3709b2e
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Dec 7 17:19:09 2010 -0300

    [media] gspca core: Fix regressions gspca breaking devices with audio
    
    Changeset 35680ba broke several devices:
        - Sony Playstation Eye (1415:2000);
        - Gigaware model 25-234 (0c45:628f);
        - Logitech Messenger Plus (046d:08f6).
    
    Probably more devices were broken by this change.
    
    What happens is that several devices don't need to save some bandwidth
    for audio.
    
    Also, as pointed by Hans de Goede <hdegoede@xxxxxxxxxx>, the logic
    that implements the bandwidth reservation for audio is broken, since
    it will reduce the alt number twice, on devices with audio.
    
    So, let's just revert the broken logic, and think on a better solution
    for usb 1.1 devices with audio that can't use the maximum packetsize.
    
    Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 86701c1d6a3ecae2f0e6771c730364d334d5a142
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Dec 7 14:47:10 2010 -0300

    [media] gspca/sn9c20x: Get rid of scale "magic" numbers
    
    Use macros for the supported scales, instead of using magic numbers
    from 0 to 3.
    
    Code become cleaner by using macros for it.
    
    Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e78567d227ecd40543508342ba39a3dfba5af14f
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Dec 6 06:53:05 2010 -0300

    [media] gspca/sn9c20x: Test if sensor is a OV sensor
    
    Instead of just assuming a ov9650 sensor based on USB ID,
    double-check it, by reading the sensor ID.
    
    Acked-by: Jean-Francois Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit dd89aec47325a251eeaf39ee4b84adb521270cba
Author: Richard Zidlicky <rz@xxxxxxxxxxxxxx>
Date:   Wed Dec 1 20:52:49 2010 -0300

    [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick
    
    Add kycodes for DSR-0112 remote that comes together with
    Haupauge MiniStick
      http://lirc.sourceforge.net/remotes/hauppauge/DSR-0112.jpg
    
    [mchehab@xxxxxxxxxx: Fix KEY_PREVIOUS to match the definition for the other 
model]
    Signed-off-by: Richard Zidlicky <rz@xxxxxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 8350e1551c27ee784ded579fd224846972d4b0d3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Tue Nov 30 18:42:07 2010 -0300

    [media] media: Remove unnecessary casts of usb_get_intfdata
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9124544320bd36d5aa21769d17a5781ba729aebf
Author: Philippe Bourdin <richel@xxxxxxxxxxxxxx>
Date:   Sun Oct 31 09:57:58 2010 -0300

    [media] Terratec Cinergy Hybrid T USB XS
    
    I found that the problems people have reported with the USB-TV-stick
    "Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042)
    are coming from a wrong header file in the v4l-sources.
    
    Attached is a diff, which fixes the problem (tested successfully here).
    Obviously the USB-ID has been associated with a wrong chip: EM2880
    instead of EM2882, which would be correct.
    
    Reported-by: Philippe Bourdin <richel@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b395cbac36e58a55729fe7e6262a3f0b1691bced
Author: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Date:   Fri Nov 26 14:06:41 2010 -0300

    [media] media: rc: lirc_dev: check kobject_set_name() result
    
    kobject_set_name() may fail with -ENOMEM, check for it.
    
    Signed-off-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 801c73c04ad57689dc9b47baf62cbb23f954d987
Author: David Härdeman <david@xxxxxxxxxxx>
Date:   Thu Nov 25 18:36:27 2010 -0300

    [media] rc-core: add loopback driver
    
    This patch adds a loopback driver to rc-core which I've found useful for
    running scripted tests of different parts of rc-core without having to
    fiddle with real hardware.
    
    Basically it emulates hardware with a learning and a non-learning
    receiver and two transmitters (which correspond to the two
    receivers). TX data that is sent is fed back as input on the
    corresponding receiver, which allows for debugging of IR decoders,
    keymaps, etc.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit dea8a39fb569c23084c857ccdbf70a95ea3bf7dc
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Nov 29 07:46:13 2010 -0300

    [media] rc-core: Initialize return value to zero
    
    At ir_setkeycode, if INPUT_KEYMAP_BY_INDEX is used, the routine may return
    an invalid value if not error.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b7c7a4bed8d695933ae172031556de9de30ae598
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sun Nov 28 11:48:26 2010 -0300

    [media] bttv: remove custom_irq and gpioq from bttv struct
    
    The RC5 old decoder used custom_irq to indicate the need of handling
    the IRQ on a different way. Instead of doing it, let the core just call the
    bttv input IRQ handler, and add the code there to call the legacy decoder.
    
    While here, remove the gpioq waitqueue, as this is not used anywhere, and
    add a debug msg to help removing the legacy RC5 code.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Thu Nov 18 00:56:37 2010 -0300

    [media] cx231xx: stray unlock on error path
    
    The lock isn't held here and doesn't need to be unlocked.  The code has
    been like this since the driver was merged.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed
Author: Paul Bender <pebender@xxxxxxxxx>
Date:   Wed Nov 17 16:56:17 2010 -0300

    [media] rc: fix sysfs entry for mceusb and streamzap
    
    When trying to create persistent device names for mceusb and streamzap
    devices, I noticed that their respective drivers are not creating the rc
    device as a child of the USB device. Rather it creates it as virtual
    device. As a result, udev cannot use the USB device information to
    create persistent device names for event and lirc devices associated
    with the rc device. Not having persistent device names makes it more
    
    difficult to make use of the devices in userspace as their names can
    change.
    
    Forward-ported to media_tree staging/for_v2.6.38 and tested with
    both streamzap and mceusb devices:
    $ ll /dev/input/by-id/
    ...
    lrwxrwxrwx. 1 root root 9 Nov 17 17:06 
usb-Streamzap__Inc._Streamzap_Remote_Control-event-if00 -> ../event6
    lrwxrwxrwx. 1 root root 9 Nov 17 17:05 
usb-Topseed_Technology_Corp._eHome_Infrared_Transceiver_TS000BzY-event-if00 -> 
../event5
    Previously, nada.
    
    Signed-off-by: Paul Bender <pebender@xxxxxxxxx>
    Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5df465df7bd9c352289ca63d4d9f78299be72c7d
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date:   Fri Nov 19 17:42:40 2010 -0300

    [media] drivers/media: nuvoton: fix chip id probe v2
    
    Make sure we have a matching chip id high and one or the other
    of the chip id low values.
    Print the values if the probe fails.
    
    Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ecfc95eb7410c04c23f59b02931e8f8b3aa4a5b3
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Mon Nov 15 17:13:54 2010 -0300

    [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b1dc614a81258eb7ff482892e7bc894f1089c144
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Mon Nov 15 00:04:28 2010 -0300

    [media] drivers/media/video: Remove unnecessary semicolons
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a363436396ad68509db4513c886055cc067a184c
Author: Alexey Chernov <4ernov@xxxxxxxxx>
Date:   Thu Oct 28 18:12:02 2010 -0300

    [media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid 
tuner
    
    I've got code which adds support of GoTView PCI DVD3 Hybrid tuner in
    cx18 module and Andy Walls in ivtv mailing-list gave me some advice on
    making a patch and sending it here. So here's the patch against
    staging/2.6.37-rc1 branch (the tutorial recommends to include it as
    plain text but if it's the case I can surely send as an attachment):
    
    Several comments on the patch:
    
    1. Both users on the official Gotview forum and support said that PCI
    DVD3 is very similar to Yuan MPC718 card so the main part of code is
    taken from Yuan configuration. Some users reported it to work properly.
    
    2. Everything is being initialized correctly including analog, dvb,
    radio and alsa parts. Analogue part and alsa virtual card is tested by
    myself using original Gotview card.
    
    [mchehab@xxxxxxxxxx: Whitespace cleanups]
    Signed-off-by: Alexey Chernov <4ernov@xxxxxxxxx>
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 97108cf682566a79ad49f165435bddbb91844d9a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Nov 22 15:50:51 2010 -0300

    [media] Fix parameter description for disable_ir
    
    It seems that a wrong cut-and-paste error were done here.
    
    Reported-by: Jeremy Kerr <jeremy.kerr@xxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit eac8ae087ac66b21de94fee3e920210b43d43076
Author: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
Date:   Mon Nov 15 15:50:13 2010 -0300

    [media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core
    
    The patch fixes the rc-tbs-nec table after converting
    drivers/media/video/cx88 to ir-core
    (commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec).
    
    It is also adds two missing buttons (10- and 10+) with
    its definition (KEY_10CHANNELSUP and KEY_10CHANNELSDOWN).
    
    [mchehab@xxxxxxxxxx: move keycode numbers to 0x1b8/0x1b9 as requested by 
the input Maintainer]
    Signed-off-by: Mariusz BiaÅ?oÅ?czyk <manio@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0e835087dfe7db19f1f072046f5e116d4ec6662b
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Wed Nov 17 02:13:39 2010 -0300

    [media] lirc_dev: add some __user annotations
    
    Sparse complains because there are no __user annotations.
    
    drivers/media/rc/lirc_dev.c:156:27: warning:
        incorrect type in initializer (incompatible argument 2 (different 
address spaces))
    drivers/media/rc/lirc_dev.c:156:27:    expected int ( *read )( ... )
    drivers/media/rc/lirc_dev.c:156:27:    got int ( extern [toplevel] 
*<noident> )( ... )
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 829ba9fe34246f1f5e813b6bf84171d36e776734
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:43:27 2010 -0300

    [media] rc-core: fix some leftovers from the renaming patches
    
    Fix some minor comments etc which are leftover from the old naming scheme.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:43:17 2010 -0300

    [media] bttv: merge ir decoding timers
    
    Similarly to saa7134, bttv_ir has two timers, only one of which is used
    at a time and which serve the same purpose. Merge them.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit edb4c25ca3a7997660500692eca3510eac9726e5
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:43:12 2010 -0300

    [media] bttv: rename struct card_ir to bttv_ir
    
    bttv_ir is more consistent with all other structs used in the same driver.
    Also, clean up the struct to remove commented out members and the 
work_struct
    which is unused.
    
    [mchehab@xxxxxxxxxx: fix a warning at bttv_rc5_timer_end]
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7c8352d18ddbe37cff8ad71175a11739662ef899
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:42:57 2010 -0300

    [media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end
    
    Both timers are used for a similar purpose. Merging them allows for some
    minor simplifications.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:42:51 2010 -0300

    [media] saa7134: some minor cleanups
    
    Mostly using appropriate data types and constants (e.g. int -> bool).
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b0ddb0f364f926785f50a8cea8a399ba63e3c227
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:42:46 2010 -0300

    [media] saa7134: use full keycode for BeholdTV
    
    Using the full keycode for BeholdTV hardware makes another module
    parameter unnecessary.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a29df8579ab2779605b181a38ac7fb99796666df
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Nov 19 20:42:41 2010 -0300

    [media] saa7134: remove unused module parameter
    
    ir_rc5_remote_gap is a leftover from ir-common, remove it.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 622d9f5d302e99dc7a06cb442e9d9ff2bb0f59b5
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Nov 16 12:32:09 2010 -0300

    [media] pwc: failure to submit an urb is a fatal error
    
    Failure to submit an urb is a fatal error, make isoc_init return an
    error when this happens rather then only log it.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c7d18867c82657a97f0bdb90ba1151b251b6a29b
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Nov 16 12:26:00 2010 -0300

    [media] pwc: Also set alt setting to alt0 when no error occured
    
    isoc_cleanup contains a check to not set the altsetting to alt0 when
    the device was unplugged, but the check currently is buggy, and causes
    the alt setting to only be set to 0 if an error occured while streaming.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3751e288bcf3d77652ef979edc0b3ea8b21d8b97
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Nov 16 11:39:25 2010 -0300

    [media] pwc: do not start isoc stream on /dev/video open
    
    pwc was starting streaming on /dev/video# open rather then on STREAM_ON. Now
    that the v4l1 compat code is removed from the pwc driver there is no reason
    left to do this. So this patch changes the pwc driver to delay starting
    the isoc stream (and thus using valuable usb bandwidth) until the 
application
    does a STREAM_ON
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a931910d3be6f63464befb2dde94ec58a6eaf5c1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Nov 22 13:22:37 2010 -0300

    [media] stb6100: warning cleanup
    
    drivers/media/dvb/frontends/stb6100.c:120: warning: 
â??stb6100_normalise_regsâ?? defined but not used
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 03c9a806e30c3904e5b5702874eebc1a4f2082bd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 16:05:05 2010 -0300

    [media] rc: Rename IR raw interface to ir-raw.c
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d100e659b61a735c3343b3d82c1c009b04072cdd
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 15:56:53 2010 -0300

    [media] rc: use rc_map_ prefix for all rc map tables
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2f4f58d689dd71dea67407b74405a3c43e797cb1
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 15:46:09 2010 -0300

    [media] rc: Name RC keymap tables as rc_map_table
    
    Remote keytables had different names all over the place. Part of the fault
    is due to a bad naming when rc subsystem was created, but there were lots
    of old names that were still here.
    
    Use a common standard for everything.
    
    Patch generated by this script:
    
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,ir_scancode,rc_map_table,g <$i >a && mv a $i; done
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,ir_codes_,rc_map_,g <$i >a && mv a $i; done
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,rc_key_map,rc_map_table,g <$i >a && mv a $i; done
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,rc_map_table_size,rc_map_size,g <$i >a && mv a $i; done
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b088ba658b3438056dab4d744701364db3f08b9a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 14:28:27 2010 -0300

    [media] rc: Properly name the rc_map struct
    
    The struct that describes a rc mapping had an weird and long name.
    We should properly name it, to make easier for developers to work
    with it, and to avoid confusion.
    
    Basically, generated by this script:
    
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,ir_scancode_table,rc_map,g <$i >a && mv a $i; done
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,rc_tab,rc_map,g <$i >a && mv a $i; done
    
    (and manually fixed where needed)
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 52b661449aecc47e652a164c0d8078b31e10aca0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 14:20:52 2010 -0300

    [media] rc: Rename remote controller type to rc_type instead of ir_type
    
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done
    for i in `find drivers/staging -type f -name *.[ch]` `find include/media 
-type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed 
s,ir_type,rc_type,g <$i >a && mv a $i; done
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 29e3ec19d5c88d534ced219d3962d67243e4d310
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 14:12:46 2010 -0300

    [media] cx231xx: Properly name rc_map name
    
    rc_map is confusing, as it may be understood as another thing. Properly
    rename the field to indicate its usage.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 13:53:11 2010 -0300

    [media] Rename all public generic RC functions from ir_ to rc_
    
    Those functions are not InfraRed specific. So, rename them to properly
    reflect it.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 6bda96447cef24fbf97a798b1ea664224d5fdc25
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 13:28:38 2010 -0300

    [media] rc: rename the remaining things to rc_core
    
    The Remote Controller subsystem is meant to be used not only by Infra Red
    but also for similar types of Remote Controllers. The core is not specific
    to Infra Red. As such, rename:
        - ir-core.h to rc-core.h
        - IR_CORE to RC_CORE
        - namespace inside rc-core.c/rc-core.h
    
    To be consistent with the other changes.
    
    No functional change on this patch.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a6e3b81f6198654207c4e972e7ed91931e53e93c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 10:05:29 2010 -0300

    [media] rc: Remove ir-common.h
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Nov 17 09:58:09 2010 -0300

    [media] rc: remove ir-common module
    
    Something weird happened with commit 
740069e6e043403199dbe2b42256722fb814f6ae.
    Instead of dong the right thing, it got somehow corrupted and reverted the
    rc changes.
    
    Thanks to David Härdeman for pointing me about the problem.
    
    This patch should be merged with 740069e6e04 before sending upstream.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1697c8dfba72fd182d670a68dca157f64dd3b1f2
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date:   Sun Nov 14 16:01:47 2010 -0300

    [media] stb0899: fix diseqc messages getting lost
    
    - Some badly written applications in conjuction with certain SEC devices
      do send too many messages causing the DiSEqC bus to get congested. As
      a result, the end devices do get confused and hence do not respond.
      The issue was found by Julian Scheel.
    
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f14bfe94e459cb070a489e1786f26d54e9e7b5de
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date:   Sun Nov 14 15:52:10 2010 -0300

    [media] stb6100: Improve tuner performance
    
    - Reduce the amount of white noise present, which causes the
      demodulator a significant time to acquire a frontend lock
      on a whole. Frontend shows a large significant improvement in
      performance.
    
    Thanks to Peter Nayler for helping to identify the potential
    hotspots and fixing them.
    
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3037fd14302d635426996fb7f6fcf7cb98dc15b9
Author: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date:   Sun Nov 14 14:56:00 2010 -0300

    [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits
    
    This function is declared extern and exported, and should not be given
    a generic name which may conflict with gpiolib in future.
    
    Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a22407faba57c3624beea1a9fad7cbdcf5a19a1a
Author: Bjørn Mork <bjorn@xxxxxxx>
Date:   Sun Nov 14 14:24:36 2010 -0300

    [media] Mantis: use dvb_attach to avoid double dereferencing on module 
removal
    
    Convert the driver to use the dvb_attach macro to avoid the hard dependency
    on the frontend drivers.  The hard dependecy will result in loading a
    number of unused frontends, and unwanted automatic dereferencing.
    
    This fixes a bug where unloading the mantis driver will derefence any
    attached frontend twice, which will cause an oops if the same frontend is
    used by another driver.
    
    Signed-off-by: Bjørn Mork <bjorn@xxxxxxx>
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9c81496a88b04206d0607b23b298b6529da1fcb0
Author: Marko Ristola <marko.ristola@xxxxxxxxxxx>
Date:   Sun Nov 14 14:09:04 2010 -0300

    [media] Mantis: append tasklet maintenance for DVB stream delivery
    
    After dvb-core has called mantis-fe->stop_feed(dvbdmxfeed)
    the last time (count to zero), no data should ever be copied
    with dvb_dmx_swfilter() by a tasklet: the target structure
    might be in an unusable state. Caller of mantis_fe->stop_feed()
    assumes that feeding is stopped after stop_feed() has been
    called, ie. dvb_dmx_swfilter() isn't running, and won't be called.
    
    There is a risk that dvb_dmx_swfilter() references freed resources
    (memory or spinlocks or ???) causing instabilities. Thus
    tasklet_disable(&mantis->tasklet) must be called inside of
    mantis-fe->stop_feed(dvbdmxfeed) when necessary.
    
    Signed-off-by: Marko Ristola <marko.ristola@xxxxxxxxxxx>
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 116d588ea21cf0278a4de1e3272e9c3220a647e7
Author: Manu Abraham <abraham.manu@xxxxxxxxx>
Date:   Thu Feb 11 04:11:05 2010 -0300

    [media] Mantis, hopper: use MODULE_DEVICE_TABLE
    
    use the macro to make modules auto-loadable
    
    Thanks to Ozan Ã?aÄ?layan <ozan@xxxxxxxxxxxxx> for pointing it out
    
    Signed-off-by: Manu Abraham <manu@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e6f199f3e7e10112adfa80700ecc00b056b5a62e
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Nov 10 09:28:19 2010 -0300

    [media] i2c: Remove obsolete cleanup for clientdata
    
    A few new i2c-drivers came into the kernel which clear the 
clientdata-pointer
    on exit. This is obsolete meanwhile, so fix it and hope the word will 
spread.
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Nov 10 11:14:13 2010 -0300

    [media] media: video: do not clear 'driver' from an i2c_client
    
    The i2c-core does this already.
    
    Reported-by: Jean Delvare <khali@xxxxxxxxxxxx>
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9a9dcb4a19c29ec01e7d249e3dae2d589af86480
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Mon Nov 8 20:08:41 2010 -0300

    [media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc 
function return values
    
    Hi,
    
    The [vk][cmz]alloc(_node) family of functions return void pointers which
    it's completely unnecessary/pointless to cast to other pointer types since
    that happens implicitly.
    
    This patch removes such casts from drivers/media/
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9c0147b6941e082f52dcbb9688d0e6e5f359744f
Author: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Date:   Wed Nov 24 16:41:09 2010 -0300

    [media] timblogiw: fix kconfig & build error
    
    timblogiw uses dma() interfaces and it selects TIMB_DMA for that
    support.  However, drivers/dma/ is not built unless
    CONFIG_DMA_ENGINE is enabled, so select/enable that symbol also.
    
    drivers/built-in.o: In function `timblogiw_close':
    timblogiw.c:(.text+0x4419fe): undefined reference to `dma_release_channel'
    drivers/built-in.o: In function `buffer_release':
    timblogiw.c:(.text+0x441a8d): undefined reference to `dma_sync_wait'
    drivers/built-in.o: In function `timblogiw_open':
    timblogiw.c:(.text+0x44212b): undefined reference to `__dma_request_channel'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c091575c8b35b39b8f271e0d4b692329a705240a
Author: Richard R�¶jfors <richard.rojfors@xxxxxxxxxxxxxx>
Date:   Mon Nov 8 10:45:48 2010 -0300

    [media] mfd: Add timberdale video-in driver to timberdale
    
    This patch defines platform data for the video-in driver
    and adds it to all configurations of timberdale.
    
    Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
    Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9eae42e5a216059a146b3fbbe24b4fdc0b10c723
Author: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
Date:   Mon Nov 8 10:45:44 2010 -0300

    [media] media: Add timberdale video-in driver
    
    This patch adds the timberdale video-in driver.
    
    The video IP of timberdale delivers the video data via DMA.
    The driver uses the DMA api to handle DMA transfers, and make use
    of the V4L2 video buffers to handle buffers against user space.
    
    If available the driver uses an encoder to get/set the video standard
    
    Signed-off-by: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 36d89f7de4a4937848de86d9b35cb03a9f0357e1
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Sun Nov 7 17:48:21 2010 -0300

    [media] drivers/staging/cx25821: Use pr_fmt and pr_<level>
    
    Fix several defects with bad line continuation uses that
    introduce whitespace.
    Fix several defects with lines missing "\n".
    Standardize prefixes via pr_fmt.
    Remove internal cx25821 prefixes.
    Standardize :%s():" ... __func__ uses.
    Coalesce long formats.
    Add KERN_<level> prefixes via pr_<level> to printks.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 13d28e4917fb6cf6898e8998f01ab83b3f468aeb
Author: Matthias Schwarzott <zzam@xxxxxxxxxx>
Date:   Sun Nov 7 10:57:13 2010 -0300

    [media] IX2505V: i2c transfer error code ignored
    
    It seems that ix2505v driver ignores a i2c error in ix2505v_read_status_reg.
    This looks like a typing error using (ret = 1) instead of correct (ret == 
1).
    
    Acked-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    Signed-off-by: Matthias Schwarzott <zzam@xxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 62c7cdd8a16025e4d5596b8e61352960745f3707
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date:   Sun Nov 7 12:54:39 2010 -0300

    [media] TM6000: Drop unused macro
    
    Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
    Cc: Michel Ludwig <michel.ludwig@xxxxxxxxx>
    Cc: Stefan Ringel <stefan.ringel@xxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7bd444ede7285cad4ed5047ff954432325fe7f95
Author: Jean Delvare <khali@xxxxxxxxxxxx>
Date:   Sun Nov 7 12:53:44 2010 -0300

    [media] TM6000: Clean-up i2c initialization
    
    Usage of templates for large structures is a bad idea, as it wastes a
    lot of space. Manually initializing the few fields we need is way more
    efficient.
    
    Also set the algorithm data const, use strlcpy instead of strcpy, fix
    a small race (device data must always be set before registering said
    device) and properly return error on adapter registration failure.
    
    Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
    Cc: Michel Ludwig <michel.ludwig@xxxxxxxxx>
    Cc: Stefan Ringel <stefan.ringel@xxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 8ea43d0a2f87b8460f46ddb7b42b5eb17c5385d2
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sat Nov 13 16:49:10 2010 -0300

    [media] rc: Remove ir-common module
    
    Now, just one old bttv board uses the old RC5 raw decoding routines.
    Its conversion to rc-core requires the generation of IRQ data for both
    positive and negative transitions at the IRQ line. I'm not sure if
    bttv driver supports it or if the transitions will be reliable enough.
    So, due to the lack of hardware for testing, the better for now is to
    just move the legacy routines to bttv driver, and wait for someone with
    a Nebula Digi could help to port it to use also rc-core raw decoders.
    
    Acked-by: Hermann Pitton <hermann-pitton@xxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 6c7e653ff668d939174aa7023736f4a40fd2be08
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sat Nov 13 16:19:54 2010 -0300

    [media] saa7134: Remove legacy IR decoding logic inside the module
    
    The only IR left still using the old raw decoders on saa7134 is ENCORE
    FM 5.3. As it is now using the standard rc-core raw decoders, lots
    of old code can be removed from saa7134.
    
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 70de39183a8b5ba0a0cd884ff46c1d81dbe939db
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sat Nov 13 16:23:06 2010 -0300

    [media] saa7134: use rc-core raw decoders for Encore FM 5.3
    
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c1937f8e3490fedec2c75383df07cd8a7154c545
Author: Stefan Ringel <stefan.ringel@xxxxxxxx>
Date:   Tue Nov 9 13:50:28 2010 -0300

    [media] tm6000: add revision check
    
    adding chip revision check
    
    Signed-off-by: Stefan Ringel <stefan.ringel@xxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 101b25b55ec48354bc40b9102b4f7922c9ad9eae
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Fri Nov 5 00:07:39 2010 -0300

    [media] drivers/media: Use vzalloc
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 42e142f6b72493b5daec9950c4c83d20ccf56a0d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Nov 13 05:10:27 2010 -0300

    [media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519)
    
    [mchehab@xxxxxxxxxx: Some CodingStyle fixes]
    Tested-by: Anca Emanuel <anca.emanuel@xxxxxxxxx>
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7491f785dd02bc35551e0463d798959b15644c1d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Sat Nov 13 03:56:41 2010 -0300

    [media] gspca - ov519: Re-initialize the webcam at resume time
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b4e96ea30a211c0979e9e0ea10f39dfa50afb8fa
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 16:13:17 2010 -0300

    [media] gspca - ov519: Initialize the ov519 snapshot register
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5927abcb21d0dd10c960517453e37302acf2269e
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 15:32:29 2010 -0300

    [media] gspca - ov519: Change the ov519 start and stop sequences
    
    - start and stop streaming are done via the FRAR
    - streaming suspend (for control change) is done by video reset
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a23acec4bca79f2168a5aeacc8d85386b70ae522
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 15:07:35 2010 -0300

    [media] gspca - ov519: Simplify the LED control functions
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e2817029b3f139bd85360536153467bd8f7f863b
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 13:59:48 2010 -0300

    [media] gspca - ov519: Check the disabled controls at start time only
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 858ea5e941fad6a2f38d0c9722bbb842d46662fb
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 13:53:10 2010 -0300

    [media] gspca - ov519: Clearer debug and error messages
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f8f20188e863dfb43ac53364da0b8865d37c97e2
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 07:54:02 2010 -0300

    [media] gspca - ov519: Propagate errors to higher level
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 83db76886c0b0a32a0c8d35b4dc3dc1d8f1287d4
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 07:14:08 2010 -0300

    [media] gspca - ov519: Define the disabled controls in a table
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 218678032589895f29f4ee01b9c330caaab44274
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 06:12:09 2010 -0300

    [media] gspca - ov519: Set their numbers in the ov519 and ov7670 register 
names
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 87bae740fd50df49337017b3ccbed9dbaeaad610
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Nov 12 05:31:34 2010 -0300

    [media] gspca - ov519: Cleanup source
    
    - move hexadecimal value to lowercase
    - remove/add empty lines and spaces
    - comment unused macros
    - change some comments
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9be1d6cde936dcf9a325eeee01ed64005c98d456
Author: Nicolas Kaiser <nikai@xxxxxxxxx>
Date:   Fri Nov 12 04:32:35 2010 -0300

    [media] gspca - cpia1: Fix error check
    
    It looks to me like it was intended to check the return value
    at this point.
    
    Signed-off-by: Nicolas Kaiser <nikai@xxxxxxxxx>
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7bbe6b8d1f63c2f7482c93d8cd986b1774e6436d
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Thu Nov 11 08:27:24 2010 -0300

    [media] gspca - ov519: Define the sensor types in an enum
    
    This patch also checks if the sensor is well detected at connection time.
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d6fa66384b38165126ce2866b4bdff756c6fc761
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Thu Nov 11 08:05:50 2010 -0300

    [media] gspca - ov519: Reduce the size of some variables
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9d1593a84c09e57a9565baab931a6cf116120e05
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Thu Nov 11 08:04:06 2010 -0300

    [media] gspca - ov519: Change types '__xx' to 'xx'
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d65174c06f2bf4ff73d1c71960be317b89561c06
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Thu Nov 11 06:20:42 2010 -0300

    [media] gspca - ov519: Don't do USB exchanges after disconnection
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 14653e64e9db48e91cbd00fba335a6a459e66cc9
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Thu Nov 11 06:17:01 2010 -0300

    [media] gspca - ov519: Handle the snapshot on capture stop when 
CONFIG_INPUT=m
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c0b33bdc5b8d9c1120dece660480d4dd86b817ee
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Wed Oct 27 09:12:30 2010 -0300

    [media] gspca-stv06xx: support bandwidth changing
    
    stv06xx devices have only one altsetting, but the actual used
    bandwidth can be programmed through a register. We were already
    setting this register lower then the max packetsize of the altsetting
    indicates. This patch makes the gspca-stv06xx update the usb descriptor
    for the alt setting to reflect the actual packetsize in use, so that
    the usb subsystem uses the correct information for scheduling usb transfers.
    
    This patch also tries to fallback to lower speeds in case a ENOSPC error
    is received when submitting urbs, but currently this is only supported
    with stv06xx cams with the pb0100 sensor, as this is the only one for
    which we know how to change the framerate.
    
    This patch is based on an initial incomplete patch by
    Lee Jones <lee.jones@xxxxxxxxxxxxx>
    
    Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxxxxx>
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bc25068495b110fcdf35a22f43d32637e99fd018
Author: Steven Toth <stoth@xxxxxxxxxxxxxx>
Date:   Fri Nov 12 18:32:36 2010 -0300

    [media] saa7164: Checkpatch compliance cleanup
    
    Checkpatch compliance cleanup across files in the saa7164 driver.
    
    Signed-off-by: Steven Toth <stoth@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0e72cc8b8d48ba05e705f432fb99aaa0ea6737c6
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Tue Nov 2 00:22:23 2010 -0300

    [media] saa7164: make buffer smaller
    
    This isn't a runtime bug, it's just to make static checkers happy.
    
    In vidioc_querycap() we copy a saa7164_dev ->name driver array into a
    v4l2_capability -> driver array.  The ->driver array is only 16 chars
    long so ->name also can't be more than 16 characters.
    
    The ->name gets set in v4l2_capability() and it always is less than 16
    characters so we can easily make the buffer smaller.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 76e4a9a7164263d8ffe816920f84a91e7dfee444
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Mon Nov 1 06:25:39 2010 -0300

    [media] tea6415c: return -EIO if i2c_check_functionality fails
    
    If the adapter does not support I2C_FUNC_SMBUS_WRITE_BYTE,
    return -EIO instead of 0.
    
    Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
    Acked-by: Hans Verkuil <hverkuil@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1ce6a1433572c650247480e1bbbca6bd61db7874
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Sat Oct 30 18:08:31 2010 -0300

    [media] drivers/media/video: Update WARN uses
    
    Add missing newlines.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9e21ccaa69674e1b0aa887722801258f7de842db
Author: VDR User <user.vdr@xxxxxxxxx>
Date:   Sat Oct 30 15:49:49 2010 -0300

    [media] dvb-usb-gp8psk: get firmware and fpga versions
    
    This patch adds retrieval of firmware and FPGA versions of Genpix devices.
    That information is useful for users who experience performance differences
    with the various firmware versions, and may want to use a specific firmware
    that best suits their needs.
    
    Example dmesg output:
    gp8psk: FW Version = 2.09.4 (0x20904)  Build 2009/04/02
    gp8psk: FPGA Version = 1
    
    Signed-off-by: Derek Kelly <user.vdr@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 141bb0dc2d0ad03202aef7c070555cd970ca6bf9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Thu Nov 11 08:14:16 2010 -0300

    [media] cx231xx: Fix i2c support at cx231xx-input
    
    There was a bug at cx231xx-input, where it were registering the remote
    controls twice, one via ir-kbd-i2c and another directly.
    Also, the patch that added rc_register_device() broke compilation for it.
    
    This patch fixes cx231xx-input by fixing the depends on, to point to the
    new symbol, and initializing the scanmask via platform_data.
    
    While here, also fix Kconfig symbol change for IR core dependencies.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2eb258327722de3ed4d84ce1b9add2bad21a0ec4
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Nov 12 09:02:40 2010 -0300

    [media] ir-kbd-i2c: add rc_dev as a parameter to the driver
    
    There are several fields on rc_dev that drivers can benefit. Allow drivers
    to pass it as a parameter to the driver.
    
    For now, the rc_dev parameter is optional. If drivers don't pass it, create
    them internally. However, the best is to create rc_dev inside the drivers,
    in order to fill other fields, like open(), close(), driver_name, etc.
    So, a latter patch making it mandatory and changing the caller drivers is
    welcome.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 5b2e303f6df1e0b1a903950c5d613a20c8c71a37
Author: David Härdeman <david@xxxxxxxxxxx>
Date:   Fri Oct 29 16:08:28 2010 -0300

    [media] rc-core: convert winbond-cir
    
    Move winbond-cir from drivers/input/misc/ into drivers/media/rc/
    and convert it to use rc-core.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d8b4b5822f51e2142b731b42c81e3f03eec475b2
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Oct 29 16:08:23 2010 -0300

    [media] ir-core: make struct rc_dev the primary interface
    
    This patch merges the ir_input_dev and ir_dev_props structs into a single
    struct called rc_dev. The drivers and various functions in rc-core used
    by the drivers are also changed to use rc_dev as the primary interface
    when dealing with rc-core.
    
    This means that the input_dev is abstracted away from the drivers which
    is necessary if we ever want to support multiple input devs per rc device.
    
    The new API is similar to what the input subsystem uses, i.e:
    rc_device_alloc()
    rc_device_free()
    rc_device_register()
    rc_device_unregister()
    
    [mchehab@xxxxxxxxxx: Fix compilation on mceusb and cx231xx, due to merge 
conflicts]
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 4c7b355df6e7f05304e05f6b7a286e59a5f1cc54
Author: David Härdeman <david@xxxxxxxxxxx>
Date:   Wed Nov 10 11:04:19 2010 -0300

    [media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main
    
    [mchehab@xxxxxxxxxx: this patch were originally bundled with some renaming
    stuff and with the file merges, as seen at:
    https://patchwork.kernel.org/patch/291092/.
    
    Instead of using the original approach, I wrote the rename patches and the
    code merge as separate changes, then applied the difference on this patch.
    This way, it is easier to see the real changes at the code, and will be 
easier
    to merge upstream, especially if some conflict rises on the renaming 
patches]
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Tested-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 631493ecacd81f1af74de459c1d16f7ffa6c82c0
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Nov 9 23:44:27 2010 -0300

    [media] rc-core: merge rc-map.c into rc-main.c
    
    With this change, all rc-core functions are into just one file, except
    for the rc-raw specific functions.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bc2a6c5719efd74ce841ad0f0c9b6ea2590da6da
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Nov 9 23:18:24 2010 -0300

    [media] rc-core: Merge rc-sysfs.c into rc-main.c
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f62de675f796a992011c598c405a3d6fada9aa20
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Nov 9 23:09:57 2010 -0300

    [media] Rename rc-core files from ir- to rc-
    
    As protocol decoders are specific to InfraRed, keep their names as-is.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 32cf86f6d16367db5a10039c1dd938a2427d697c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Tue Nov 9 23:00:14 2010 -0300

    [media] rename drivers/media/IR to drives/media/rc
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Oct 29 16:08:12 2010 -0300

    [media] ir-core: more cleanups of ir-functions.c
    
    cx88 only depends on VIDEO_IR because it needs ir_extract_bits().
    Move that function to ir-core.h and make it inline.
    
    Lots of drivers had dependencies on VIDEO_IR when they really
    wanted IR_CORE.
    
    The only remaining drivers to depend on VIDEO_IR are bt8xx and
    saa7134 (ir_rc5_timer_end is the only function exported by
    ir-functions).
    
    Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or
    converting drivers to IR_CORE that they do not want a dependency
    on IR_LEGACY.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 62c6503125389763a74911408d984c5dd09eeb97
Author: David H�¤rdeman <david@xxxxxxxxxxx>
Date:   Fri Oct 29 16:08:07 2010 -0300

    [media] ir-core: remove remaining users of the ir-functions keyhandlers
    
    This patch removes the remaining usages of the ir_input_nokey() and
    ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c
    by using the corresponding functionality in ir-core instead.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2997137be8eba5bf9c07a24d5fda1f4225f9ca7d
Author: David Härdeman <david@xxxxxxxxxxx>
Date:   Fri Oct 29 16:08:02 2010 -0300

    [media] ir-core: convert drivers/media/video/cx88 to ir-core
    
    This patch converts the cx88 driver (for sampling hw) to use the
    decoders provided by ir-core instead of the separate ones provided
    by ir-functions (and gets rid of those).
    
    The value for MO_DDS_IO had a comment saying it corresponded to
    a 4kHz samplerate. That comment was unfortunately misleading. The
    actual samplerate was something like 3250Hz.
    
    The current value has been derived by analyzing the elapsed time
    between interrupts for different values (knowing that each interrupt
    corresponds to 32 samples).
    
    Thanks to Mariusz Bialonczyk <manio@xxxxxxxxxx> for testing my patches
    (about one a day for two weeks!) on actual hardware.
    
    Signed-off-by: David Härdeman <david@xxxxxxxxxxx>
    Acked-by: Jarod Wilson <jarod@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 00df055ae315c9c8792dc4d012e6ad9c4d527e87
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date:   Fri Oct 29 11:31:39 2010 -0300

    [media] radio-si4713: Add regulator framework support
    
    Convert the driver to use regulator framework instead of set_power callback.
    This with gpio_reset platform data provide cleaner way to manage chip VIO,
    VDD and reset signal inside the driver.
    
    Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
    Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bf797165f099296b622bcdcea1126a113e0aaac4
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sat Oct 9 15:09:17 2010 -0300

    [media] au0828: enable VBI timeout when calling read() without streamon()
    
    Because some clients (e.g. tvtime) will just open the filehandle and call
    read() instead of explicitly calling streamon first, we need to make sure 
the
    VBI timeout routine gets enabled in this case.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 78ca500559b5a4f16a95c198b3e7bdfac8455bf8
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sat Oct 9 14:43:53 2010 -0300

    [media] au0828: fixes for timeout on no video
    
    The first pass of fixes to cause the driver to continue streaming even when
    there is no video arriving over the ITU656 bus were not adequate.  Continue
    the work from the previous patch.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 6e04b7b95a5bd2da0aa5df05fc09a1f0d6615666
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Wed Sep 1 22:03:43 2010 -0300

    [media] au0828: continue video streaming even when no ITU-656 coming in
    
    We need the au0828 to continue delivering frames even when the device is not
    delivering video, or else applications such as tvtime will block 
indefinitely.
    
    Unfortunately, the au8522 doesn't have any sort of free-running mode or 
"blue
    screen on no video" like some other decoders.
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 301c9f26d7ded6e274a99c3a447a9a36790a3f3e
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sun Jun 27 18:12:42 2010 -0300

    [media] au8522: Handle differences in comb filter config for s-video input
    
    Tweak the comb filter config when in s-video mode to match the Hauppauge
    Windows driver values (based on register dumps).
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d2c194ce4781d62bf671aa6b65a2fccb39feb50e
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sun Jun 27 18:01:40 2010 -0300

    [media] au8522: fix clamp control for different video modes
    
    Straighten out the clamp control configurations for the various video modes,
    based off of register diffs done against the Hauppauge Windows driver.
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2428a2ed6a7cbc7be6db5c70c3838a4bf0de9f48
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sun Jun 27 17:40:42 2010 -0300

    [media] au8522: cleanup code which disables audio decoder
    
    Cleanup the routine which disables the audio decoder.  In particular, the 
i2s
    output was being shut off but the audio processor itself was not, resulting
    in more power being consumed than needed.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bde3bb9a67d2cd260df6be9726c9c360a0e3cee9
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Mon Jul 5 13:05:16 2010 -0300

    [media] au0828: Fix field alignment for video frames delivered by driver
    
    Fix the alignment of fields being delivered by the driver, which was
    resulting in jerky video when there was horizontal motion (since the bottom
    field of the frame was being sent with the top field of the previous frame)
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 83f859c5a6d6e01d671f002c0ade3498b4a4b245
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Fri Jun 25 01:33:39 2010 -0300

    [media] au0828: set max packets per URB to match Windows driver
    
    We had the max packets per URB set to an incredibly low "10" as opposed to
    the Windows driver which has it as 128.  Set the value to match the
    Windows driver, which will reduce interrupts considerably.
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 88464106f97fe1c143bda2b4019b07c3069d454c
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
Date:   Sun Jun 13 17:31:22 2010 -0300

    [media] au8522: Properly set default brightness
    
    The chip's default value for the brightness didn't match what we were 
sending
    back in the queryctrl ioctl(), so if the application actually set the
    brightness to the "default", it would actually end up being way too bright.
    
    This work was sponsored by GetWellNetwork Inc.
    
    Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1d00d6c1ff13607974fcd9469aa9466fcd253c3a
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Oct 29 13:58:22 2010 -0300

    [media] gspca: Convert some uppercase hexadecimal values to lowercase
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a79cc7b9182abb2e3936a26064dec414b417f1d1
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Oct 29 08:10:37 2010 -0300

    [media] gspca - sonixj: Simplify and clarify the hv7131r probe function
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit d581bcd78be567af7026e3d13b54ec7df8db8b82
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Oct 29 08:01:01 2010 -0300

    [media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 
resolution
    
    The bad value prevented the autogain to work correctly
    and some images were truncated.
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit a23c1947f4da31d9aac9bfc05ef22d8148b2f106
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Oct 29 07:57:03 2010 -0300

    [media] gspca - main: Fix a small code error
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 0b8851b6c3934a56eb1a4ff284ab5133065e0cb8
Author: Jean-François Moine <moinejf@xxxxxxx>
Date:   Fri Oct 29 07:56:06 2010 -0300

    [media] gspca - main: Version change
    
    Signed-off-by: Jean-François Moine <moinejf@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 614d06917de2823d598a4b231256d08074044235
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Wed Oct 27 07:42:28 2010 -0300

    [media] gspca_ov519: generate release button event on stream stop if needed
    
    Generate a release button event when the button is still pressed when the
    stream stops.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit e0657be5615f666f261206ed62c3f0dc2527956e
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Wed Oct 27 06:38:07 2010 -0300

    [media] gspca_xirlink_cit: Add support camera button
    
    gspca_xirlink_cit: Add support camera button
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2c4e776aa370a7a1619c7ada0604e9003fe1d92a
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Oct 26 17:21:33 2010 -0300

    [media] gspca_xirlink_cit: Frames have a 4 byte footer
    
    At least on the ibm netcam pro frames have a 4 byte footer, take this
    into account when calculating sizeimage.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit bc46bae6373c87897959c7aa8fb9f6c4218695b8
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Oct 26 11:18:59 2010 -0300

    [media] gspca_xirlink_cit: various usb bandwidth allocation improvements / 
fixes
    
    The following usb bandwidth allocation changes were made to the ibm netcam
    pro code:
    - Don't restart negotiation at max packet size on stop0, as that gets called
      by gspca_main during negotiation. Move this to sd_isoc_init.
    - Don't ask for full bandwidth when running at 160x120, that does not need
      full bandwidth
    - Make minimum acceptable bandwidth depend upon resolution
    
    [mchehab@xxxxxxxxxx: Fix CodingStyle problems at switch statements]
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 2661da47daefd4f22f9fdc7e9294a1cb9edf515b
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Oct 26 05:16:32 2010 -0300

    [media] gspca: only set gspca->int_urb if submitting it succeeds
    
    Currently alloc_and_submit_int_urb() is setting gspca->int_urb
    as soon as the allocation has succeeded, but if the subsequent
    submit fails, the urb gets destroyed. And then later will
    get destroyed again in gspca_input_destroy_urb() because
    gspca->int_urb is set, leading to a double free.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 314b3e0881c6acb4f40e07565ac1a7798c7698a3
Author: Hans de Goede <hdegoede@xxxxxxxxxx>
Date:   Tue Oct 26 05:15:46 2010 -0300

    [media] gspca: submit interrupt urbs *after* isoc urbs
    
    Currently gspca supported usb-1.1 webcams for which we support the input
    button through an interrupt endpoint won't stream (not enough bandwidth
    error) when used through an USB-2.0 hub.
    
    After much debugging I've found out that the cause for this is that the
    ehci-sched.c schedeling code does not like it when there are already urb's
    scheduled when (large) isoc urbs are queued. By moving the submission
    of the interrupt urbs to after submitting the isoc urbs the camera
    starts working again through usb-2.0 hubs.
    
    Note that this does not fix isoc. streaming through a usb-hub while another
    1.1 usb device (like the microphone of the same cam) is also active
    at the same time :(
    
    I've spend a long time analyzing the linux kernel ehci scheduler code,
    resulting in this (long) mail:
    http://www.spinics.net/lists/linux-usb/msg37982.html
    
    The conclusion of the following mail thread is that yes there are several
    issues when using usb-1.1 devices through a usb-2.0 hub, but these are not
    easily fixable in the current code. Fixing this in ehci-sched.c requires
    an almost full rewrite, which is not bound to happen anytime soon.
    
    So with this patch gspca driven usb-1.1 webcams will atleast work when
    connected through an usb-2.0 hub when the microphone is not used.
    
    As an added bonus this patch avoids extra destroy/create input urb cycles
    when we end up falling back to a lower speed alt setting because of 
bandwidth
    limitations.
    
    Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 25ad9847ca09f744b4cfea362d339c8b5b49765c
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date:   Thu Nov 4 17:17:51 2010 -0300

    [media] lmedm04: change USB Timeouts to avoid troubles
    
    DM04/QQBOX USB Timing change.
    
    Improved timing to avoid USB corruptions on some systems.
    
    Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit afcd0806094d9ae0d944f30776edc075e4584b96
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date:   Tue Nov 2 18:02:08 2010 -0300

    [media] Documentation/lmedm04: Fix firmware extract information
    
    Corrected Firmware Information for LG on LME2510.
    
    Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f23e6616ac2dc560db0ee8733024ebe90de9161a
Author: Malcolm Priestley <tvboxspy@xxxxxxxxx>
Date:   Wed Oct 27 19:50:36 2010 -0300

    [media] lmed04: Improve frontend handling
    
    Improved frontend handling.
    
    Frontend now remains open at all times, with signal lock, snr & signal level
    polled from Interupt.
    
    Updated driver for DM04/QQBOX USB DVB-S BOXES to version 1.70.
    
    Signed-off-by: Malcolm Priestley <tvboxspy@xxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ea7c681e899bda3fceb37815d63d201c3b4be920
Author: Daniel Drake <dsd@xxxxxxxxxx>
Date:   Wed Oct 27 10:55:00 2010 -0300

    [media] cafe_ccic: fix colorspace corruption on resume
    
    If you suspend and resume during video capture, the video colours
    are corrupted on resume. This is because the sensor is being unconditionally
    powered off during the resume path.
    
    Only power down during resume if the camera is not in use, and correctly
    reconfigure the sensor during resume.
    Fixes http://dev.laptop.org/ticket/10190
    
    Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
    Acked-by: Jonathan Corbet <corbet@xxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit c429e7b62a54bf34c1995b45faeaeb84104f1705
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Mon Oct 25 23:44:25 2010 -0300

    [media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses
    
    Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) 
dprintk(...)
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sat Oct 23 13:35:58 2010 -0300

    [media] cx231xx: Add IR support for Pixelview Hybrid SBTVD
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9ab66912e0cd671fbea1b99e8a37d11b14d50baf
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sat Oct 23 13:28:33 2010 -0300

    [media] cx231xx: Add a driver for I2C-based IR
    
    Although cx231xx has a very good IR support, already supported by
    mceusb driver, some designs decided to add a separate I2C
    microcontroller chip in order to handle IR.
    
    Due to that, add a glue to ir-kbd-i2c is needed, in order to support
    those devices.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit f0551efc77b0f34a93a14d2bf96051612e352a39
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sun Oct 3 07:01:26 2010 -0300

    [media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 68541cdaadecbc280cd50122f11fdbb249a2ae29
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sun Oct 3 05:27:59 2010 -0300

    [media] Add support for Kworld SBTVD board
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 7572f9c5575c721f43b575a71fda1ecd896e0327
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sun Oct 3 16:48:49 2010 -0300

    [media] mb86a20s: add support for serial streams
    
    By comparing the traffic between Pixelview (cx23102-based and Kworld
    (saa7134-based), the only difference is at register 0xd5. After some
    tests, It seems that it is used to change mode between serial and parallel.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 55fa288deca4b17e539ba49a9b0d0ed474afa6f8
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Wed Sep 29 11:07:08 2010 -0300

    [media] cx231xx: use callback to set agc on PixelView
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ede676c72d0b18f1c15300f7874370e771489a1c
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Sep 27 23:44:27 2010 -0300

    [media] add digital support for PV SBTVD hybrid
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 9417bc6dd9de85944501f8f4ce8dd0e64135ca82
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Sun Sep 26 20:44:31 2010 -0300

    [media] Add analog support for Pixelvied Hybrid SBTVD
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit b9ede79ada766eec535e1230970bd885489d5990
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Mon Sep 27 20:52:43 2010 -0300

    [media] add a driver for mb86a20s
    
    This adds the trivial bits to mb86a20s. As the driver won't touch
    at the channel/layer parameters, this may not be enough for
    receiving all channels, especially ISDB-Tsb, but the driver worked
    properly for receiving video channels on my tests.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ca3dfd6a6f8364c1d51e548adb4564702f1141e9
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Sep 10 17:29:14 2010 -0300

    [media] em28xx: Add support for Leadership ISDB-T
    
    This device uses an em2874B + Sharp 921 One Seg frontend.
    
    Signed-off-by: Douglas Schilling Landgraf <dougsland@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 3a509bb11acded0dfebbfcc740d85e0774b0769a
Author: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date:   Fri Sep 10 16:49:47 2010 -0300

    [media] Re-write the s921 frontend
    
    On our tests with Leadership ISDBT, the s921 frontend were not work. As its
    design contained some weird things, it ended to be easier to just re-write
    it, getting another frontend as an example (cx24123).
    
    As the old s921 driver weren't used, there's no regression. Some info from
    the old frontend were used as a way to double check the behavior that were
    noticed on the USB dumps retrieved from Leadership driver.
    
    Signed-off-by: Douglas Schilling Landgraf <dougsland@xxxxxxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit 94a544a4e8d05a027613443c529c399c39cc3371
Merge: 496a2e360a34e1f41c336d23947f800216cb9bdf 
21486af0f34d03b813b023d7a2b887b329f60486
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Wed Dec 29 01:05:14 2010 -0700

    Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into 
spi/next
    
    * 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
      spi/pxa2xx: register driver properly
      spi/pxa2xx: add support for shared IRQ handler
      spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
      arm/pxa2xx: reorgazine SSP and SPI header files
      spi/pxa2xx: Add CE4100 support
      spi/pxa2xx: Consider CE4100's FIFO depth
      spi/pxa2xx: Add chipselect support for Sodaville
      spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX 
bytes.
      spi/pxa2xx: pass of_node to spi device and set a parent device

commit 496a2e360a34e1f41c336d23947f800216cb9bdf
Merge: 5aa68b85951aec91d6a955d1de861325fc9a3ba1 
23ce17adb7fc33a4353abe4b57a03f555cced57b
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Wed Dec 29 00:47:29 2010 -0700

    Merge branch 'for-grant' of 
git://arago-project.org/git/projects/linux-davinci into spi/next
    
    * 'for-grant' of git://arago-project.org/git/projects/linux-davinci into 
spi/next
       spi: davinci: fix checkpatch errors
       spi: davinci: whitespace cleanup
       spi: davinci: remove unused variable 'pdata'
       spi: davinci: set chip-select mode in SPIDEF only once
       spi: davinci: enable both activation and deactivation of chip-selects
       spi: davinci: remove unnecessary data transmit on CS disable
       spi: davinci: enable GPIO lines to be used as chip selects
       spi: davinci: simplify prescalar calculation
       spi: davinci: remove 'wait_enable' platform data member
       spi: davinci: make chip-slect specific parameters really chip-select 
specific
       spi: davinci: consolidate setup of SPIFMTn in one function
       spi: davinci: setup chip-select timers values only if timer enabled
       spi: davinci: add support for wait enable timeouts
       spi: davinci: remove unused members of davinci_spi_slave
       spi: davinci: eliminate the single member structure davinci_spi_slave
       spi: davinci: eliminate unnecessary update of davinci_spi->count
       spi: davinci: simplify calculation of edma acount value
       spi: davinci: check for NULL buffer pointer before using it
       spi: davinci: remove unnecessary disable of SPI
       spi: davinci: remove unnecessary 'count' variable in driver private data
       spi: davinci: remove unnecessary completion variable initialization
       spi: davinci: remove non-useful interrupt mode support
       spi: davinci: simplify poll mode transfers
       spi: davinci: add support for interrupt mode
       spi: davinci: configure the invariable bits in spipc0 only once
       spi: davinci: remove unnecessary function davinci_spi_bufs_prep()
       spi: davinci: remove unnecessary call to davinci_spi_setup_transfer()
       spi: davinci: do not store DMA channel information per chip select
       spi: davinci: always start transmit DMA
       spi: davinci: do not use temporary buffer if no transmit data provided
       spi: davinci: always start receive DMA
       spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot
       spi: davinci: fix DMA event generation stoppage
       spi: davinci: fix EDMA CC errors at end of transfers
       spi: davinci: handle DMA completion errors correctly
       spi: davinci: remove usage of additional completion variables for DMA
       spi: davinci: let DMA operation be specified on per-device basis
       spi: davinci: remove non-useful "clk_internal" platform data
       spi: davinci: enable and power-up SPI only when required
       spi: davinci: setup the driver owner
       spi: davinci: add additional comments
       spi: davinci: add EF Johnson Technologies copyright
       spi: davinci: removed unused #defines
       spi: davinci: remove unnecessary typecast
       spi: davinci: do not treat Tx interrupt being set as error
       spi: davinci: do not allocate DMA channels during SPI device setup
       spi: davinci: remove unnecessary private data member 'region_size'
       spi: davinci: shorten variable names
       spi: davinci: kconfig: add manufacturer name to prompt string

commit 387c31c7e5c9805b0aef8833d1731a5fe7bdea14
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 17:05:48 2010 -0800

    Linux 2.6.37-rc8

commit 6f7f41851cc4508b672ab71dd48a154712faf15c
Merge: 82cd19cd93727d494c530ddd6a7338033c3fd86e 
e1e359273576ee8fe27021356b064c772ed29af3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 15:54:24 2010 -0800

    Merge branch 'perf-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page

commit 82cd19cd93727d494c530ddd6a7338033c3fd86e
Merge: b52e2a6d6d05421dea6b6a94582126af8cd5cca2 
5cdd2de0a76d0ac47f107c8a7b32d75d25768dc1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 15:53:54 2010 -0800

    Merge branch 'x86-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/microcode: Fix double vfree() and remove redundant pointer checks 
before vfree()

commit 776065e36de1d5eb9e33ff908352fef4050ab38d
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:38:03 2010 +0100

    ASoC: codecs: wm8753: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8753 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Furthermore the generic cache uses zero-based numbering while the wm8753 
cache
    uses one-based numbering.
    Thus we end up with two from each other incoherent caches, which leads to 
undefined
    behaviour and crashes.
    This patch fixes the issue by changing the wm8753 driver to use the generic
    register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>

commit da280f51d0b341282b4181eb3235f774b0446584
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:38:02 2010 +0100

    ASoC: codecs: wm9090: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm9090 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm9090 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit 7f87e30ef29951f4509a7f86acf00e1ba48af54a
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:38:01 2010 +0100

    ASoC: codecs: wm8962: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8962 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm8962 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit 715920d04c787ed718327da53cf51689e51ef3ce
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:38:00 2010 +0100

    ASoC: codecs: wm8955: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8955 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm8955 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit f578a188e8b21be623b48bb0eb3a92174c2e5b82
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:37:59 2010 +0100

    ASoC: codecs: wm8904: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8904 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm8904 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit 52ca353bc8597dcc1d6d7abc03eecc1b452d79c9
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:37:58 2010 +0100

    ASoC: codecs: wm8741: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8741 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm8741 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit beebca312009e9567d5e0229ea6b82bdf9a864cf
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:37:57 2010 +0100

    ASoC: codecs: wm8523: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the wm8523 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the wm8523 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Cc: Ian Lartey <ian@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: Dimitris Papastamos <dp@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit d24eb0db9c8a7ceecae860bdc636ed1e8a86943a
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:37:56 2010 +0100

    ASoC: codecs: max98088: Fix register cache incoherency
    
    The multi-component patch(commit f0fba2ad1) moved the allocation of the
    register cache from the driver to the ASoC core. Most drivers where 
adjusted to
    this, but the max98088 driver still uses its own register cache for its
    private functions, while functions from the ASoC core use the generic cache.
    Thus we end up with two from each other incoherent caches, which can lead to
    undefined behaviour.
    This patch fixes the issue by changing the max98088 driver to use the
    generic register cache in its private functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Cc: Peter Hsiang <Peter.Hsiang@xxxxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit 7f984b55acb6530bf854bfcac13104228f3336c1
Author: Lars-Peter Clausen <lars@xxxxxxxxxx>
Date:   Tue Dec 28 21:08:57 2010 +0100

    ASoC: codecs: Add missing control_type initialization
    
    Some codec drivers do not initialize the control_type field in their private
    device struct, but still use it when calling snd_soc_codec_set_cache_io.
    This patch fixes the issue by properly initializing it in the drivers probe
    functions.
    
    Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx (for 2.6.37 only)

commit e7d282535c94cddc208c03b7cd0815f70d676a0e
Author: Joe Perches <joe@xxxxxxxxxxx>
Date:   Thu Dec 9 23:16:55 2010 -0800

    [IA64] Remove unlikely from cpu_is_offline
    
    cpu_is_offline already uses unlikely internally.
    
    Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
    Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

commit 409e590572d980c314e989e94176bcb060130fae
Author: Jiri Slaby <jslaby@xxxxxxx>
Date:   Mon Nov 22 10:41:19 2010 +0100

    [IA64] irq_ia64, use set_irq_chip
    
    Don't access desc->chip directly, because them chip member will
    disappear some time later.
    
    Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
    Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

commit e21763dbce76d3a07ead438f8811b3e4bce0825b
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Sat Oct 30 21:35:58 2010 +0200

    [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
    
    vzalloc() nicely zeroes memory for us, so we don't have to do a vmalloc()
    and then manually memset() the returned memory when all we want is for it
    to be zero. Patch changes this for pfm_rvmalloc().
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

commit 75c1c91cb92806f960fcd6e53d2a0c21f343081c
Author: Dimitri Sivanich <sivanich@xxxxxxx>
Date:   Tue Dec 28 13:34:42 2010 -0600

    [IA64] eliminate race condition in smp_flush_tlb_mm
    
    A race condition exists within smp_call_function_many() when called from
    smp_flush_tlb_mm().  On rare occasions the cpu_vm_mask can be cleared
    while smp_call_function_many is executing, occasionally resulting in a
    hung process.
    
    Make a copy of the mask prior to calling smp_call_function_many().
    
    Signed-off-by: Dimitri Sivanich <sivanich@xxxxxxx>
    Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>

commit a7dd6027e55992dd7c409a71a4a2b576fda2f7c2
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Thu Dec 23 20:15:39 2010 +0000

    vxge: remove duplicated part of check
    
    This is just a cleanup to make the static checkers happy.  We don't need
    to check "own" twice.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Acked-by: Ram Vepa <ram.vepa@xxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 4a5fc4e179d79c79ad87bfc12a2d7e9b2371e40c
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Thu Dec 23 19:17:34 2010 +0000

    skfp: testing the wrong variable in skfp_driver_init()
    
    The intent here was to test if the allocation failed but we tested
    "SharedMemSize" instead of "SharedMemAddr" by mistake.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Reviewed-by: Jiri Pirko <jpirko@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit d39cd5e99a0ad88aba6793fb5e5f34e29cda6e6f
Author: stephen hemminger <shemminger@xxxxxxxxxx>
Date:   Mon Dec 20 17:58:33 2010 +0000

    ppp: allow disabling multilink protocol ID compression
    
    Linux would not connect to other router running old version Cisco IOS 
(12.0).
    This is most likely a bug in that version of IOS, since it is fixed
    in later versions. As a workaround this patch allows a module parameter
    to be set to disable compressing the protocol ID.
    
    See: https://bugzilla.vyatta.com/show_bug.cgi?id=3979
    
    RFC 1990 allows an implementation to formulate MP fragments as if protocol
    compression had been negotiated.  This allows us to always send compressed
    protocol IDs.  But some implementations don't accept MP fragments with
    compressed protocol IDs.  This parameter allows us to interoperate with
    them.  The default value of the configurable parameter is the same as the
    current behavior:  protocol compression is enabled.  If protocol compression
    is disabled we will not send compressed protocol IDs.
    
    This is based on an earlier patch by Bob Gilligan (using a sysctl).
    Module parameter is writable to allow for enabling even if ppp
    is already loaded for other uses.
    
    Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
    Acked-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Acked-by: Paul Mackerras <paulus@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit c4711786986af0cce654f493426ee0a1055e4b17
Author: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
Date:   Mon Dec 20 09:02:37 2010 +0000

    ehea: Avoid changing vlan flags
    
    This patch avoids disabling the vlan flags using ethtool.
    
    Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 12f188f2e59394ec1f1c8c0a4439f48ec16bc336
Author: Dan Williams <dcbw@xxxxxxxxxx>
Date:   Sun Dec 19 08:17:50 2010 +0000

    ueagle-atm: fix PHY signal initialization race
    
    A race exists when initializing ueagle-atm devices where the generic atm
    device may not yet be created before the driver attempts to initialize
    it's PHY signal state, which checks whether the atm device has been
    created or not.  This often causes the sysfs 'carrier' attribute to be
    '1' even though no signal has actually been found.
    
    uea_probe
       usbatm_usb_probe
          driver->bind (uea_bind)
             uea_boot
                kthread_run(uea_kthread)     uea_kthread
          usbatm_atm_init                       uea_start_reset
             atm_dev_register                      UPDATE_ATM_SIGNAL
    
    UPDATE_ATM_SIGNAL checks whether the ATM device has been created and if
    not, will not update the PHY signal state.  Because of the race that
    does not always happen in time, and the PHY signal state remains
    ATM_PHY_SIG_FOUND even though no signal exists.
    
    To fix the race, just create the kthread during initialization, and only
    after initialization is complete, start the thread that reboots the
    device and initializes PHY state.
    
    [ 3030.490931] uea_probe: calling usbatm_usb_probe
    [ 3030.490946] ueagle-atm 8-2:1.0: usbatm_usb_probe: trying driver 
ueagle-atm with vendor=1110, product=9031, ifnum  0
    [ 3030.493691] uea_bind: setting usbatm
    [ 3030.496932] usb 8-2: [ueagle-atm] using iso mode
    [ 3030.497283] ueagle-atm 8-2:1.0: usbatm_usb_probe: using 3021 byte buffer 
for rx channel 0xffff880125953508
       <kthread already started before usbatm_usb_probe() has returned>
    [ 3030.497292] usb 8-2: [ueagle-atm] (re)booting started
       <UPDATE_ATM_SIGNAL checks whether ATM device has been created yet before 
setting PHY state>
    [ 3030.497298] uea_start_reset: atm dev (null)
       <and since it hasn't been created yet PHY state is not set>
    [ 3030.497306] ueagle-atm 8-2:1.0: usbatm_usb_probe: using 3392 byte buffer 
for tx channel 0xffff8801259535b8
    [ 3030.497374] usbatm_usb_probe: about to init
    [ 3030.497379] usbatm_usb_probe: calling usbatm_atm_init
       <atm device finally gets created>
    [ 3030.497384] usbatm_atm_init: creating atm device!
    
    Signed-off-by: Dan Williams <dcbw@xxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit b52e2a6d6d05421dea6b6a94582126af8cd5cca2
Merge: bec41d5b8417ccb98e4752affa24e1dc563d99f9 
994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 11:23:50 2010 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c

commit bec41d5b8417ccb98e4752affa24e1dc563d99f9
Merge: 92a8cd42673f119896df7e964976c18952eb9970 
24d8c0293b04ad207648bb2a0dbfebff8b47d166
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 11:23:30 2010 -0800

    Merge branch 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      [media] v4l: soc-camera: fix multiple simultaneous user case

commit 92a8cd42673f119896df7e964976c18952eb9970
Merge: 88a58101608f1416f4c1ec81d88faed258a34b3d 
274476f8fe0b6ac9bac542cc39de12c3dd0f43f6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 28 11:22:58 2010 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
      mmc: Fix re-probing with PM_POST_RESTORE notification
      mmc: atmel-mci: fix multiblock SDIO transfers
      mmc: at91_mci: fix multiblock SDIO transfers

commit 88a58101608f1416f4c1ec81d88faed258a34b3d
Author: Imre Kaloz <kaloz@xxxxxxxxxxx>
Date:   Mon Dec 27 22:59:57 2010 +0100

    ARM: fix IXP4xx build failure
    
    arm: export dma_set_coherent_mask
    
    While a regression was fixed with commit 710224fa2750cf (arm: fix
    "arm: fix pci_set_consistent_dma_mask for dmabounce devices"), a
    new one was introduced as dma_set_coherent_mask wasn't exported
    for modules. This patch takes care for this issue.
    
    Signed-off-by: Imre Kaloz <kaloz@xxxxxxxxxxx>
    Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 1873bb8115e678ad9fd0aac9dbbc68383bc36e06
Author: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
Date:   Sat Dec 25 11:57:09 2010 +0200

    RAMOOPS: Don't overflow over non-allocated regions
    
    The current code mis-calculates the ramoops header size, leading to an
    overflow over the next record at best, or over a non-allocated region at
    worst.  Fix that calculation.
    
    Signed-off-by: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
    Acked-by: Marco Stornelli <marco.stornelli@xxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 202b6ca149dc90d3d81772413e1e1c0b65e83012
Author: Ping Cheng <pinglinux@xxxxxxxxx>
Date:   Fri Dec 24 13:13:25 2010 -0800

    Input: wacom_w8001 - use __set_bit to set keybits
    
    This makes code safer and easier to read.
    
    Signed-off-by: Ping Cheng <pingc@xxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 5c461b913a16aed8afa285a1d00414791a9afe33
Merge: ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 
4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f
Author: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Date:   Mon Dec 27 17:33:20 2010 -0800

    Merge branch 'next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next

commit ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219
Author: David Sterba <dsterba@xxxxxxx>
Date:   Mon Dec 27 17:20:01 2010 -0800

    Input: bu21013_ts - fix misuse of logical operation in place of bitop
    
    Signed-off-by: David Sterba <dsterba@xxxxxxx>
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit a06a09c802c869426cfe8c405c381c985c3b25b2
Author: Pali Rohár <pali.rohar@xxxxxxxxx>
Date:   Mon Dec 27 17:21:45 2010 -0800

    Input: i8042 - add Acer Aspire 5100 to the Dritek list
    
    This patch adds notebook Acer Aspire 5100 to the list of Dritek HW. Acer
    Aspire 5100 needs Dritek keyboard extension to support all Fn keys.
    
    Signed-off-by: Pali Rohár <pali.rohar@xxxxxxxxx>
    Tested-by: Pali Rohár <pali.rohar@xxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 731ece41fb1047816303295a0cdfed90a528137e
Author: Olof Johansson <olof@xxxxxxxxx>
Date:   Fri Dec 10 02:09:23 2010 -0600

    modpost: Fix address calculation in reloc_location()
    
    This patch fixes a segfault in modpost that is observed when the gold
    linker is used to link the input objects.
    
    The problem is that reloc_location (modpost.c) is computing the
    address of the relocation target incorrectly. Here, elf->hdr points
    to the beginning of the ELF file in memory, sechdr points to the
    relocation section header, section is the index of the section
    being relocated, and sechdrs[section].sh_offset would be the offset
    of that section, relative to the beginning of the ELF file. Adding
    elf->hdr + sechdrs[section].sh_offset gives you the address of the
    beginning of the section, and adding r->r_offset to that gives you the
    address of the location to be relocated. You do not need to subtract
    sechdrs[section].sh_addr from that -- the result of this is an address
    outside the file, and causes the segfault when addend_386_rel tries to
    dereference it.
    
    This bug is not observed when GNU ld is used to link the inputs. The
    object file ubuntu/omnibook/omnibook.o is the result of an ld -r of
    several other files.  When GNU ld does an ld -r, it sets the vaddr
    field for each section to 0, but gold lays out the section addresses
    sequentially instead:
    
    Section Headers:
     [Nr] Name              Type            Addr     Off    Size   ES Flg Lk 
Inf Al
     [ 0]                   NULL            00000000 000000 000000 00      0   
0  0
     [ 1] .text             PROGBITS        00000000 000034 004794 00  AX  0   
0  4
     [ 2] .data             PROGBITS        0000b9d0 0047c8 0009c0 00  WA  0   
0  4
     [ 3] .bss              NOBITS          000162f8 005188 00013c 00  WA  0   
0  4
     [ 4] .rodata.str1.1    PROGBITS        00004f2d 0052c4 001b1a 01 AMS  0   
0  1
     [ 5] .init.text        PROGBITS        00004794 006dde 0005fa 00  AX  0   
0  1
     [ 6] .exit.text        PROGBITS        00004d8e 0073d8 00018a 00  AX  0   
0  1
      ...
    
    So the bug in the tool remained undiscovered because the section's vaddr
    always happened to be 0.
    
    Signed-off-by: Raymes Khoury <raymes@xxxxxxxxxx>
    Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit c8217b8305e5e75c23617f2f4cd262527d952c0a
Author: Cliff Wickman <cpw@xxxxxxx>
Date:   Mon Dec 13 10:51:57 2010 -0600

    x86, paravirt: Use native_halt on a halt, not native_safe_halt
    
    halt() should use native_halt()
    safe_halt() uses native_safe_halt()
    
    If CONFIG_PARAVIRT=y, halt() is defined in arch/x86/include/asm/paravirt.h 
as
    
    static inline void halt(void)
    {
            PVOP_VCALL0(pv_irq_ops.safe_halt);
    }
    
    Otherwise (no CONFIG_PARAVIRT) halt() in arch/x86/include/asm/irqflags.h is
    
    static inline void halt(void)
    {
            native_halt();
    }
    
    So it looks to me like the CONFIG_PARAVIRT case of using native_safe_halt()
    for a halt() is an oversight.
    Am I missing something?
    
    It probably hasn't shown up as a problem because the local apic is disabled
    on a shutdown or restart.  But if we disable interrupts and call halt()
    we shouldn't expect that the halt() will re-enable interrupts.
    
    Signed-off-by: Cliff Wickman <cpw@xxxxxxx>
    LKML-Reference: <E1PSBcz-0001g1-FM@xxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>

commit 32ae2ade462146729580117d9886cc9efd83dfbe
Author: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
Date:   Thu Dec 23 16:04:23 2010 +0100

    perf probe: Fix short file name probe location reporting
    
    After adding probes, perf-probe(1) reports the probes locations which 
include
    filenames for certain cases.
    
    But for short file names (whose length < 32), perf-probe didn't display the
    name correctly. It actually skipped the first character.
    
    Here's an example where 'icmp.c' was screwed:
    
       $ perf probe -n -a "icmp.c;sk=*"
       Add new events:
         probe:icmp_push_reply (on @cmp.c)
         probe:icmp_reply     (on @cmp.c)
         probe:icmp_reply_1   (on @cmp.c)
         probe:icmp_send      (on @cmp.c)
         probe:icmp_send_1    (on @cmp.c)
         probe:icmp_error     (on @cmp.c)
         probe:icmp_error_1   (on @cmp.c)
         probe:icmp_error_2   (on @cmp.c)
         probe:icmp_error_3   (on @cmp.c)
    
    This patch fixes this bug in synthesize_perf_probe_point().
    
    Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
    Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
    LKML-Reference: <m31v588r9k.fsf@xxxxxxxxx>
    Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 0597fcd08b858df83b9f20afd6035311d92c48f8
Author: Arnaud Lacombe <lacombar@xxxxxxxxx>
Date:   Thu Dec 23 03:25:16 2010 -0500

    kconfig: fix warning
    
    In file included from scripts/kconfig/zconf.tab.c:2502:
    scripts/kconfig/expr.c:1033: warning: no previous prototype for 
'expr_simplify_unmet_dep'
    
    Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: Arnaud Lacombe <lacombar@xxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit ffc96d628b651b69b39909fc3e9e8f465df1eed3
Merge: c816d7c64e82cae69fa5c7365474d37444a97ccf 
29c185e5c681ca00d863d161eda7eadb93e32ee5
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Dec 27 10:36:27 2010 -0800

    Merge branch 'nommu-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6
    
    * 'nommu-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/nommu-2.6:
      nommu: Provide stubbed alloc/free_vm_area() implementation.
      nommu: Fix up vmalloc_node() symbol export regression.

commit c816d7c64e82cae69fa5c7365474d37444a97ccf
Merge: b094a870ae33426442b0cbcf8025f1ef919d1def 
30f2ba38011247ad95bffbf0743a0dc0656a5eb7
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Dec 27 10:34:09 2010 -0800

    Merge branch 'sh-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
    
    * 'sh-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: intc: Initialize radix tree gfp mask explicitly.
      sh: Fix up SH7201 clkfwk build.
      sh: mach-se: Fix up SE7206 build.
      sh: Fix up SH4-202 clkfwk build.

commit b094a870ae33426442b0cbcf8025f1ef919d1def
Merge: 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094 
cb59bfc59024115279de0d7612558caa72ec95f1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Dec 27 10:33:30 2010 -0800

    Merge branch 'fbdev-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
    
    * 'fbdev-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6:
      fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
      video: imxfb: Fix the maximum value for yres
      fb: fix overlapping test off-by-one.
      fbdev: sh-mobile: retrieve and propagate display sizes from EDID
      fbdev: sh-mobile: restore display size configuration

commit 4e838c7e6ebaf7b2febaafe2cd598a44fdceb094
Merge: bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad 
ff5dd32b997a5a5ce3f4256257991133d694da0b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Mon Dec 27 10:25:02 2010 -0800

    Merge branch 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      pata_cs5536: avoid implicit MSR API inclusion on x86-64

commit 86280a208825d55ba988420b6b0ed2d6b9ec80f8
Author: David Sterba <dsterba@xxxxxxx>
Date:   Mon Dec 27 16:27:43 2010 +0100

    HID: picolcd: fix misuse of logical operation in place of bitop
    
    CC: Bruno Prémont <bonbons@xxxxxxxxxxxxxxxxx>
    CC: Jiri Kosina <jkosina@xxxxxxx>
    Signed-off-by: David Sterba <dsterba@xxxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit cb59bfc59024115279de0d7612558caa72ec95f1
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Thu Nov 4 11:06:06 2010 +0000

    fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p
    
    LCDC hardware can support 1920x1080 formats, adjust the driver to cover 
them.
    Besides, instead of guessing some "reasonable" validity checks, only verify
    values in .fb_check_var(), that we are sure, we cannot support.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 60328917e6019c7f8a2e70c08d433a05ba9fcfb7
Author: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
Date:   Fri Dec 24 10:28:24 2010 -0200

    video: imxfb: Fix the maximum value for yres
    
    MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.
    
    Fix the maximum value for yres.
    
    Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 5cdd2de0a76d0ac47f107c8a7b32d75d25768dc1
Author: Jesper Juhl <jj@xxxxxxxxxxxxx>
Date:   Sat Dec 25 19:57:41 2010 +0100

    x86/microcode: Fix double vfree() and remove redundant pointer checks 
before vfree()
    
    In arch/x86/kernel/microcode_intel.c::generic_load_microcode()
    we have  this:
    
        while (leftover) {
                ...
                if (get_ucode_data(mc, ucode_ptr, mc_size) ||
                    microcode_sanity_check(mc) < 0) {
                        vfree(mc);
                        break;
                }
                ...
        }
    
        if (mc)
                vfree(mc);
    
    This will cause a double free of 'mc'. This patch fixes that by
    just  removing the vfree() call in the loop since 'mc' will be
    freed nicely just  after we break out of the loop.
    
    There's also a second change in the patch. I noticed a lot of
    checks for  pointers being NULL before passing them to vfree().
    That's completely  redundant since vfree() deals gracefully with
    being passed a NULL pointer.  Removing the redundant checks
    yields a nice size decrease for the object  file.
    
    Size before the patch:
       text    data     bss     dec     hex filename
       4578     240    1032    5850    16da arch/x86/kernel/microcode_intel.o
    Size after the patch:
       text    data     bss     dec     hex filename
       4489     240     984    5713    1651 arch/x86/kernel/microcode_intel.o
    
    Signed-off-by: Jesper Juhl <jj@xxxxxxxxxxxxx>
    Acked-by: Tigran Aivazian <tigran@xxxxxxxxxxxxxxxxxxxx>
    Cc: Shaohua Li <shaohua.li@xxxxxxxxx>
    LKML-Reference: 
<alpine.LNX.2.00.1012251946100.10759@xxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 17f7f4d9fcce8f1b75b5f735569309dee7665968
Merge: 041110a439e21cd40709ead4ffbfa8034619ad77 
d7c1255a3a21e98bdc64df8ccf005a174d7e6289
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Sun Dec 26 22:37:05 2010 -0800

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    Conflicts:
        net/ipv4/fib_frontend.c

commit ff5dd32b997a5a5ce3f4256257991133d694da0b
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date:   Sun Dec 26 19:42:15 2010 -0500

    pata_cs5536: avoid implicit MSR API inclusion on x86-64
    
    We don't need or want MSR usage here, on x86-64.
    x86-64 was disabled intentionally in Kconfig, but commit
    9272dcc232b84ccb027d6861077934055d42764d changed that.
    
    drivers/ata/pata_cs5536.c:47:1: warning: "rdmsr" redefined
    In file included from arch/x86/include/asm/irqflags.h:60,
                     from include/linux/irqflags.h:15,
                     from arch/x86/include/asm/system.h:11,
                     from arch/x86/include/asm/processor.h:17,
                     from include/linux/prefetch.h:14,
                     from include/linux/list.h:7,
                     from include/linux/module.h:9,
                     from drivers/ata/pata_cs5536.c:33:
    arch/x86/include/asm/paravirt.h:146:1: warning: this is the location of the 
previous definition
    drivers/ata/pata_cs5536.c:48:1: warning: "wrmsr" redefined
    arch/x86/include/asm/paravirt.h:154:1: warning: this is the location of the 
previous definition
    
    Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit bbbcde9d9614683fbeb41f00728cfbfb7f75a7ad
Merge: d7c1255a3a21e98bdc64df8ccf005a174d7e6289 
5acdb1af907d5908b4942d425c0983f353dd8fc5 
cde44d1740bcb3dcfecbf792a71826431e61686e
Author: Len Brown <len.brown@xxxxxxxxx>
Date:   Sun Dec 26 17:05:07 2010 -0500

    Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release

commit 5acdb1af907d5908b4942d425c0983f353dd8fc5
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Sun Dec 26 12:47:06 2010 +0100

    ACPI / ACPICA: Disable GPEs during initialization
    
    GPEs with corresponding _Lxx/_Exx control methods need to be disabled
    during initialization in case they have been enabled by the BIOS, so
    that they don't fire up until they are enabled by acpi_update_gpes().
    
    References: https://bugzilla.kernel.org/show_bug.cgi?id=25412
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

commit d7c1255a3a21e98bdc64df8ccf005a174d7e6289
Merge: d3c7e1ab043abd7706db4fbccf327df9e62f7990 
fc75fc8339e7727167443469027540b283daac71
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Sun Dec 26 12:06:56 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
      ipv4: dont create routes on down devices
      epic100: hamachi: yellowfin: Fix skb allocation size
      sundance: Fix oopses with corrupted skb_shared_info
      Revert "ipv4: Allow configuring subnets as local addresses"
      USB: mcs7830: return negative if auto negotiate fails
      irda: prevent integer underflow in IRLMP_ENUMDEVICES
      tcp: fix listening_get_next()
      atl1c: Do not use legacy PCI power management
      mac80211: fix mesh forwarding
      MAINTAINERS: email address change
      net: Fix range checks in tcf_valid_offset().
      net_sched: sch_sfq: fix allot handling
      hostap: remove netif_stop_queue from init
      mac80211/rt2x00: add ieee80211_tx_status_ni()
      typhoon: memory corruption in typhoon_get_drvinfo()
      net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant
      net_sched: always clone skbs
      ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.
      netlink: fix gcc -Wconversion compilation warning
      asix: add USB ID for Logitec LAN-GTJ U2A
      ...

commit 003ea98195eebdfcf476317b517e8c29a25b9d10
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date:   Wed Dec 15 08:06:23 2010 -0800

    iwlwifi: remove reference to Gen2
    
    The correct name should be used for the newer devices, remove
    reference to Gen2
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>

commit bdb84fec61aab7047b1b108b6b6824c003bc4d11
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Wed Dec 15 06:07:56 2010 -0800

    iwlagn: fix FH error
    
    # iw wlan0 interface add moni0 type monitor flags control
    # ip link set moni0 up
    
    causes a continuous spew of FH_ERROR from the
    device. Fix this by not setting the CTL2HOST
    filter by itself -- CTL + promisc works fine.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>

commit e88735d711948a580741fd337afd4ec11c395174
Author: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Date:   Sat Dec 11 08:46:56 2010 -0800

    iwlwifi: remove extra string
    
    For "led_mode" module parameters, string "led_mode" is duplicated twice,
    remove one.
    
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>

commit fc75fc8339e7727167443469027540b283daac71
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Wed Dec 22 04:39:39 2010 +0000

    ipv4: dont create routes on down devices
    
    In ip_route_output_slow(), instead of allowing a route to be created on
    a not UPed device, report -ENETUNREACH immediately.
    
    # ip tunnel add mode ipip remote 10.16.0.164 local
    10.16.0.72 dev eth0
    # (Note : tunl1 is down)
    # ping -I tunl1 10.1.2.3
    PING 10.1.2.3 (10.1.2.3) from 192.168.18.5 tunl1: 56(84) bytes of data.
    (nothing)
    # ./a.out tunl1
    # ip tunnel del tunl1
    Message from syslogd@shelby at Dec 22 10:12:08 ...
      kernel: unregister_netdevice: waiting for tunl1 to become free.
    Usage count = 3
    
    After patch:
    # ping -I tunl1 10.1.2.3
    connect: Network is unreachable
    
    Reported-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Reviewed-by: Octavian Purdila <opurdila@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 7a36df8a857edee8cd8967cbe99a85574d22f482
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date:   Sat Dec 25 07:39:59 2010 +0000

    epic100: hamachi: yellowfin: Fix skb allocation size
    
    Joel Soete reported oopses during pppoe over sundance NIC, caused by
    a bug in skb allocation and dma mapping code, where skb_reserve()
    bytes weren't taken into account. As a followup to the patch:
    "sundance: Fix oopses with corrupted skb_shared_info" very similar
    code is fixed here for three other drivers.
    
    Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
    Cc: Joel Soete <soete.joel@xxxxxxxxxx>
    Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 78a36f25478432835f2f1e46202b71ff3ae454ff
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date:   Sat Dec 25 05:12:17 2010 +0000

    sundance: Fix oopses with corrupted skb_shared_info
    
    Joel Soete reported oopses at the beginning of pppoe connections since
    v2.6.35. After debugging the bug was found in sundance skb allocation
    and dma mapping code, where skb_reserve() bytes aren't taken into
    account. This is an old bug, only uncovered by some change in 2.6.35.
    
    Initial debugging patch by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    
    Reported-by: Joel Soete <soete.joel@xxxxxxxxxx>
    Tested-by: Joel Soete <soete.joel@xxxxxxxxxx>
    Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
    Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 041110a439e21cd40709ead4ffbfa8034619ad77
Merge: a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f 
2316aa2aee254c126e688b53a3a105b82bc3f368
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Sat Dec 25 19:20:38 2010 -0800

    Merge branch 'master' of 
master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6

commit a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:10 2010 +0000

    bna: Update the driver version to 2.3.2.3
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 1d32f7696286eef9e5644eb57e79a36756274357
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:09 2010 +0000

    bna: IOC failure auto recovery fix
    
    Change Details:
        - Made IOC auto_recovery synchronized and not timer based.
        - Only one PCI function will attempt to recover and reinitialize
        the ASIC on a failure, that too after all the active PCI
        functions acknowledge the IOC failure.
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit aad75b66f1d3784514351f06bc589c55d5325bc8
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:08 2010 +0000

    bna: Restore VLAN filter table
    
    Change Details:
        - Retrieve the VLAN configuration from the networking stack
        and apply it to the base interface during ifconfig up
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit ce9b9f383775e6de74ca4c93d5c643dc3d76dd3c
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:07 2010 +0000

    bna: Removed unused code
    
    Change Details:
        - Remove unused APIs and code cleanup
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 2c7d38210ff8e65f8961699bce92c273c77d113c
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:06 2010 +0000

    bna: IOC uninit check and misc cleanup
    
    Change Details:
        - Added a check in ioc firmware lock function to see if IOC is
        in BFI_IOC_UNINIT state or not. If it is not in UNINIT state
        and the last IOC boot was not done by OS driver, force IOC state
        to BFI_IOC_UNINIT
        - Unused macro and API cleanup
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f7c0fa4cd5dcf58dd95b216d2c33444a3b4a44e0
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:05 2010 +0000

    bna: Fix for TX queue
    
    Change Details:
        - Call netif_wake_queue() if we have freed up sufficient elements
        at the end of completion processing
        - Add netif_queue_stopped counter back to bnad_drv_stats {}
        - Get netif_queue_stopped value from stack
        - Remove BUG_ON() on value returned by pci_unmap_addr()
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 886f7fedb0cee56acca7620d89186669273d3d56
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:04 2010 +0000

    bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix
    
    Change Details:
        - Enable reception of pure priority tagged packets by default by
        turning on VLAN Id = 0
        - Clear the promiscuous mode, all multicast mode flags when
        bna_rxf_uninit is called
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 815f41e74031d6dc6d6dd988f58c03a1d72d02b9
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:03 2010 +0000

    bna: Fix ethtool register dump and reordered an API
    
    Change Details:
        - Removed semaphore register dump from ethtool
        - Moved netif_carrier_off() call to before calling bna_init()
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 0613ecfc94b13e86c9ff1252fd63e35a94475cd6
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:02 2010 +0000

    bna: Port enable disable sync and txq priority fix
    
    Change Details:
        - Fixed port enable/disable sync through a change in LL port state
        machine
        - Change txq->priority masking to 0x7 (3 bits) from 0x3 (2 bits)
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit be7fa3263a15d3f278c3bfbf606ec169aaa3a920
Author: Rasesh Mody <rmody@xxxxxxxxxxx>
Date:   Thu Dec 23 21:45:01 2010 +0000

    bna: TxRx and datapath fix
    
    Change Details:
        - Check HW ready condition before accessing h/w register in data-path
        - Postpone clean-up of data buffers to the data-path restart path and
        wait in the cleanup routines for in-flight DMA to complete
        - Separate out Tx completion processing from Rx poll routine
    
    Signed-off-by: Debashis Dutt <ddutt@xxxxxxxxxxx>
    Signed-off-by: Rasesh Mody <rmody@xxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 24d8c0293b04ad207648bb2a0dbfebff8b47d166
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Sat Dec 25 18:29:52 2010 -0300

    [media] v4l: soc-camera: fix multiple simultaneous user case
    
    A recent patch has introduced a regression, whereby a second open of an
    soc-camera video device breaks the running capture. This patch fixes this 
bug
    by guaranteeing, that video buffers get initialised only during the first 
open
    of the device node.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

commit ce0ac9e1851364fa67c991659ce1db05ab82c6ae
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Sat Dec 25 18:33:12 2010 -0200

    perf script: Fix event ordering settings to work with older kernels
    
    If we don't use .ordering_requires_timestamps we'll end up trying to order
    events with no timestamps when running on older kernels.
    
    Problem introduced in eac23d1c.
    
    After the last three fixes, perf scripting is back working, tested with
    new perf userspace on old and new (with sample_id_all) kernels.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    Cc: Torok Edwin <edwintorok@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 3ae22e8c8ac39daf88ae32f047fb23825be7c646
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Sat Dec 25 15:32:27 2010 +0100

    spi / PM: Support dev_pm_ops
    
    Allow SPI drivers to use runtime PM and other dev_pm_ops features by
    implementing dev_pm_ops for the bus. The existing bus specific suspend
    and resume functions will be called if a driver does not provide dev_pm_ops
    allowing for transition to the new model.
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Acked-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit a43d3f08c64125edbdfdc3d3aa512d3e37321f37
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Sat Dec 25 12:12:25 2010 -0200

    perf record: Fix use of sample_id_all userspace with !sample_id_all kernels
    
    Check if parse_single_tracepoint_event has already asked for 
PERF_SAMPLE_TIME.
    
    This is kludgy but short term fix for problems introduced by eac23d1c that
    broke 'perf script' by having different sample_types when using multiple
    tracepoint events when we use a perf binary that tries to use sample_id_all 
on
    an older kernel.
    
    We need to move counter creation to perf_session, support different
    sample_types, etc.
    
    Ongoing work on the perf test infrastructure needs this so that we can 
create
    counters to monitor threads generating specific events, etc.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    Cc: Torok Edwin <edwintorok@xxxxxxxxx>
    Cc: Ian Munsie <imunsie@xxxxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 765532c8aaac624b5f8687af6d319c6a1138a257
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Thu Dec 23 13:10:22 2010 -0200

    perf script: Finish the rename from trace to script
    
    The scripts have calls to 'perf trace' that need to be converted to 'perf 
script', do it.
    
    This problem was introduced in 133dc4c.
    
    Reported-by: Torok Edwin <edwintorok@xxxxxxxxx>
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
    Cc: Torok Edwin <edwintorok@xxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 2316aa2aee254c126e688b53a3a105b82bc3f368
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Thu Dec 2 07:12:26 2010 +0000

    ixgbevf: Add X540 VF device support to the ixgbevf driver
    
    The X540 introduces a new Virtual Function device ID so that the X540
    VF device can be distinguished from the 82599 VF device.  The X540 VF
    device will have additional capability over the 82599 VF device so it
    is necessary to be able to discern the difference.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit a985b6c31ff230a1246d921afbfc0f6a1386be83
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Thu Nov 18 03:02:52 2010 +0000

    ixgbe: Add anti-spoofing feature support
    
    Add support for the anti-spoofing feature in the HW.  Packets from
    VF devices with spoofed MAC addresses or VLAN tags will be blocked
    and a counter incremented.  During the watchdog timer the spoofed
    packet dropped counter is read and if it is non-zero then a warning
    message is displayed on the host VMM's console.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 3377eba79e15671799876f82d30446e656aac5ad
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Tue Dec 7 08:16:45 2010 +0000

    ixgbe: Add SR-IOV feature support to X540
    
    Add X540 specific feature support to X540
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit d3306c2974481ff9c539de22a37bb667e8694be2
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Thu Nov 18 03:03:23 2010 +0000

    ixgbe: Warn on VF attempt to override Administratively set MAC/VLAN
    
    Print warnings to the system log when the VF attempts to override
    MAC/VLAN settings that were configured by the VMM Host administrator
    using the ip link set commands.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 031d7952ee63e1aa679f7e87700e3281f4de4ba2
Author: Williams, Mitch A <mitch.a.williams@xxxxxxxxx>
Date:   Thu Dec 9 03:23:56 2010 +0000

    igbvf: add support for i350 VF device
    
    Add support to igbvf for the new i350 virtual function device.
    
    Signed-off-by: Mitch Williams <mitch.a.williams@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 0e512bfc2c0cd6072387092f8d1ac8e1a758965b
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date:   Thu Nov 18 03:12:30 2010 +0000

    igbvf: force link checking when mailbox timeout has occurred
    
    This change forces the link down when a mailbox timeout has occurred.
    Previously it was possible for a mailbox timeout to occur but for the
    interface to stay up.  The problem with this was that it became possible
    for an interface to stay up and miss multiple requests resulting in a
    possible issue since the interface will be running in an unknown state.
    
    Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 13800469d40bf4dc9fbed17f4692b2ebe94d4526
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Sat Nov 6 02:08:26 2010 +0000

    igb: Add Anti-spoofing feature support
    
    Add support for the anti-spoofing feature in the HW.  Packets from
    VF devices with spoofed MAC addresses or VLAN tags will be blocked
    and an event generated.  When the watchdog task runs it will call a
    function to check if any spoof events occurred.  If an event was
    detected then a warning message is dumped to the system log.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 1b5dda331ff8646a70d247cace45a60035937a9b
Author: Gasparakis, Joseph <joseph.gasparakis@xxxxxxxxx>
Date:   Thu Dec 9 01:41:01 2010 +0000

    igb: Some fine tuning
    
    This patch does the following:
    
    1. Changes the existing supported device id's so now DH89xxCC is not 
supported when EEPROM is not read.
    2. Adds two more device ids for DH89xxCC in backplane mode and SFP.
    3. Driver now initializes previously possibly uninitialized value in 
igb_reset_mdicnfg_82580().
    
    Signed-off-by: Joseph Gasparakis <joseph.gasparakis@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit a6b5ea353845b3f3d9ac4317c0b3be9cc37c259b
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Sat Nov 6 05:42:59 2010 +0000

    igb: Warn on attempt to override administratively set MAC/VLAN
    
    Print a warning message to the system log when the VF attempts to
    override administratively set MAC/VLAN configuration.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 8fa7e0f739b70db14e788efba4960bfc1873d550
Author: Greg Rose <gregory.v.rose@xxxxxxxxx>
Date:   Sat Nov 6 05:43:21 2010 +0000

    igb: Fix overwrite of the VF's flags
    
    The vf flags were being overwritten causing the flag that indicates
    that the PF has set the VF MAC address to get cleared.  This would
    allow the VF to override the MAC address assigned by the Host VMM
    using the ip link set command.
    
    Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit b1cdfead0e532d7614b5d5b97044df94cc8945ae
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date:   Sat Dec 11 05:53:47 2010 +0000

    e1000e: checkpatch warnings - braces
    
    WARNING: braces {} are not necessary for any arm of this statement
    WARNING: braces {} are not necessary for single statement blocks
    
    Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
    Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 6480641eb741cabbba8e196d4f17db7fb80d101c
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date:   Sat Dec 11 05:53:42 2010 +0000

    e1000e: checkpatch error - open braces
    
    ERROR: that open brace { should be on the previous line
    
    Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
    Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 184125a389cf2c81980de5d5f365c786cc76d229
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date:   Sat Dec 11 05:53:37 2010 +0000

    e1000e: checkpatch error - trailing statements
    
    ERROR: trailing statements should be on next line
    
    Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
    Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit f0f1a172b2a9e26319b9aa95fa6c322ebb01089d
Author: Bruce Allan <bruce.w.allan@xxxxxxxxx>
Date:   Sat Dec 11 05:53:32 2010 +0000

    e1000e: checkpatch error - macro panethesis
    
    ERROR: Macros with complex values should be enclosed in parenthesis
    
    Signed-off-by: Bruce Allan <bruce.w.allan@xxxxxxxxx>
    Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>

commit 68f20d948c86bd6bbc075052f6b6c45b8f56957e
Author: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Date:   Fri Dec 17 12:14:34 2010 +0000

    Documentation/networking: Update Intel Wired LAN docs
    
    - Update the Intel Wired LAN documentation with the latest
      URL for ethtool.
    
    - replace "Ethtool" with "ethtool"
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
    Tested-by: Emil Tantilov <emil.s.tantilov@xxxxxxxxx>

commit cde44d1740bcb3dcfecbf792a71826431e61686e
Author: Len Brown <len.brown@xxxxxxxxx>
Date:   Fri Dec 24 21:43:16 2010 -0500

    Revert "ACPI battery: update status upon sysfs query"
    
    This reverts commit 3138b32d5e0998ba3cbd1c74bdc1887d74c5279b.
    
    as it caused a crash upon battery removal:
    https://bugzilla.kernel.org/show_bug.cgi?id=25302
    
    Signed-off-by: Len Brown <len.brown@xxxxxxxxx>

commit d3c7e1ab043abd7706db4fbccf327df9e62f7990
Merge: dfe80f63293ece364795c2e87805882c9ec3a266 
4bdac7da5237170b1392f39ebee99d235043fad8
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 13:00:37 2010 -0800

    Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
    
    * 'merge' of git://git.secretlab.ca/git/linux-2.6:
      spi/mpc52xx-spi: fix annotation for remove()-pointer
      spi/fsl_espi: fix wrong setting of the address in the command buffer
      spi/fsl_espi: change the read behaviour of the SPIRF
      of/i2c: Fix request module by alias
      powerpc/mpc5200: include fs.h in mpc52xx_gpt.c

commit dfe80f63293ece364795c2e87805882c9ec3a266
Merge: a4790c9457ae973d598bbd5ce58f9eaa2dd1576b 
e5005b15c91f3362036067bde5210d5c78af2f0d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 13:00:16 2010 -0800

    Merge branch 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: issue DIPM enable commands with LPM state updated
      libata: no special completion processing for EH commands
      pata_mpc52xx: driver needs BMDMA
      pata_cs5536: Add support for non-X86_32 platforms
      libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()

commit a4790c9457ae973d598bbd5ce58f9eaa2dd1576b
Merge: 08da5a32b7789289f48f3037b64df2945b5dafc2 
bcbea798f8f1492052c23ceb4fbc2a96013a3865
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 12:59:09 2010 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
      kthread_work: make lockdep happy

commit 08da5a32b7789289f48f3037b64df2945b5dafc2
Merge: eda4b716ea1f2a647a39cebae66b3fae4c4b80e4 
29687512c0b084957112cc2c0743ce34cd0d5055
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 12:58:43 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] fix up documentation for change in ->queuecommand to lockless 
calling
      [SCSI] bfa: rename log_level to bfa_log_level

commit e5005b15c91f3362036067bde5210d5c78af2f0d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Thu Dec 9 16:13:15 2010 +0100

    libata: issue DIPM enable commands with LPM state updated
    
    Low level drivers may behave differently depending on the current
    link->lpm_policy.  During ata_eh_set_lpm(), DIPM enable commands are
    issued after the successful completion of ap->ops->set_lpm(), which
    means that the controller is already in the target state.  This causes
    DIPM enable commands to be processed with mismatching controller power
    state and link->lpm_policy value.
    
    In ahci, link->lpm_policy is used to ignore certain PHY events if LPM
    is enabled; however, as DIPM commands are issued with stale
    link->lpm_policy, they sometimes end up triggering these conditions
    and get aborted leading to LPM configuration failure.
    
    Fix it by updating link->lpm_policy before issuing DIPM enable
    commands.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Reported-by: Kyle McMartin <kyle@xxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit f08dc1ac6b15c681f4643d8da1700e06c3855608
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Thu Dec 9 15:59:32 2010 +0100

    libata: no special completion processing for EH commands
    
    ata_qc_complete() contains special handling for certain commands.  For
    example, it schedules EH for device revalidation after certain
    configurations are changed.  These shouldn't be applied to EH
    commands but they were.
    
    In most cases, it doesn't cause an actual problem because EH doesn't
    issue any command which would trigger special handling; however, ACPI
    can issue such commands via _GTF which can cause weird interactions.
    
    Restructure ata_qc_complete() such that EH commands are always passed
    on to __ata_qc_complete().
    
    stable: Please apply to -stable only after 2.6.38 is released.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Reported-by: Kyle McMartin <kyle@xxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 869934adfc8391ec2e198ed81260e1a42cd9c575
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 16:50:10 2010 +0100

    pata_mpc52xx: driver needs BMDMA
    
    Found by this build-error if BMDMA is disabled:
    
    drivers/ata/pata_mpc52xx.c: In function 'mpc52xx_ata_init_one':
    drivers/ata/pata_mpc52xx.c:662: error: 'ata_bmdma_interrupt' undeclared 
(first use in this function)
    ...
    
    Move the Kconfig entry to the proper location as needed since
    9a7780c9acb821fe1c2b6fc53f74cc2556ff5364 (libata-sff: make BMDMA optional)
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 9272dcc232b84ccb027d6861077934055d42764d
Author: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
Date:   Fri Dec 24 21:39:08 2010 +0800

    pata_cs5536: Add support for non-X86_32 platforms
    
    pata_cs5536 does work on the other platforms(e.g. Loongson, a MIPS
    variant), so, remove the dependency of X86_32 and fix the building
    errors under the other platforms via only reserving the X86_32 specific
    parts for X86_32.
    
    pata_amd also supports cs5536 IDE controller, but this one saves about
    33k for the compressed kernel image(vmlinuz for MIPS).
    
    Signed-off-by: Zhang Le <r0bertz@xxxxxxxxxx>
    Signed-off-by: Chen Jie <chenj@xxxxxxxxxx>
    Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 687a993339c4f3a63654746230da3aab8bbdbffd
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 3 15:19:13 2010 +0100

    libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()
    
    While separating out BMDMA irq handler from SFF, commit c3b28894
    (libata-sff: separate out BMDMA irq handler) incorrectly made
    __ata_sff_port_intr() consider an IRQ to be an idle one if the host
    state was transitioned to HSM_ST_ERR by ata_bmdma_port_intr().
    
    This makes BMDMA drivers ignore IRQs reporting host bus error which
    leads to timeouts instead of triggering EH immediately.  Fix it by
    making __ata_sff_port_intr() consider the IRQ to be an idle one iff
    the state is HSM_ST_IDLE.  This is equivalent to adding HSM_ST_ERR to
    the "break"ing case but less error-prone.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Reported-by: Antonio Toma <antonio.toma@xxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Jeff Garzik <jgarzik@xxxxxxxxxx>

commit 5aa68b85951aec91d6a955d1de861325fc9a3ba1
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Fri Dec 17 15:44:00 2010 +0100

    spi/mpc52xx-psc-spi: move probe/remove to proper sections
    
    Probe/remove should be in __devinit/__devexit. Found by a section-mismatch
    warning. Also, copy do_remove() over to remove().
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit dc69d1af9e8d9cbbabff88bb35a6782187a22229
Author: Ben Gamari <bgamari.foss@xxxxxxxxx>
Date:   Fri Dec 24 02:48:09 2010 +0000

    omap2: Make OMAP2PLUS select OMAP_DM_TIMER
    
    It appears that arch/arm/mach-omap2/timer-gp.o is needed by OMAP2PLUS.
    Since timer-gp.o has direct dependencies on omap_dm_timer_*, it seems
    correct for the architecture to depend upon OMAP_DM_TIMER, otherwise
    unsuspecting integrators will be faced with a whole bunch of linker
    errors at the end of their kernel build:
    
    arch/arm/mach-omap2/built-in.o: In function `omap2_gp_timer_set_mode':
    /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:84: undefined 
reference to `omap_dm_timer_stop'
    /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:88: undefined 
reference to `omap_dm_timer_get_fclk'
    /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:90: undefined 
reference to `omap_dm_timer_set_load_start'
    ...
    
    Signed-off-by: Ben Gamari <bgamari.foss@xxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit fe13471c4b546e07ddbaf5fb2209b50c14b99b20
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Thu Dec 23 22:30:32 2010 +0000

    OMAP4: hwmod data: Fix alignment and end of line in structurefields
    
    In order to be fully aligned with the Python generator output,
    change a couple of fields.
    
    - Add tab in class structures to align attributes
    - Add a comma at the end of the following line to simplify
      the generation by having always the same eol:
      ".pre_shutdown   = &omap2_wd_timer_disable,"
    - Add a blank line before the first entry of the
      omap44xx_hwmods array.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Cc: Paul Walmsley <paul@xxxxxxxxx>
    Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit d7cf5f33fc68573d7bb9d4fc244ea1a3ed0b011b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Thu Dec 23 22:30:31 2010 +0000

    OMAP4: hwmod data: Move the DMA structures
    
    The merge of the DMA series on top of the already modified
    omap_hwmod_data_44xx.c put the dma_system structures at
    the wrong position in the file.
    Re-order it properly.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Cc: Paul Walmsley <paul@xxxxxxxxx>
    Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 1f6a717f1c000bb6184fe09c5ae99bad5965cadf
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Thu Dec 23 22:30:30 2010 +0000

    OMAP4: hwmod data: Move the smartreflex structures
    
    The merge of the SR series on top of the already modified
    omap_hwmod_data_44xx.c moved the smartreflex structures at the wrong
    position in the file.
    - Re-order the structures properly.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Cc: Thara Gopinath <thara@xxxxxx>
    Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 4d218826ad9ba5ab0b2d7e0a2b14f2a1e48a5e0b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Thu Dec 23 22:30:29 2010 +0000

    OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
    
    Add the missing SIDLE_SMART_WKUP flag in idlemodes field of
    the smartreflex sysconfig structure.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Cc: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Thara Gopinath <thara@xxxxxx>
    Tested-by: G, Manjunath Kondaiah <manjugk@xxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    usb: don't use flush_scheduled_work()
    
    flush_scheduled_work() is being deprecated.  Directly flush or cancel
    work items instead.
    
    * u_ether, isp1301_omap, speedtch conversions are straight-forward.
    
    * ochi-hcd should only flush when quirk_nec() is true as otherwise the
      work wouldn't have been initialized.
    
    * In oti6858, cancel_delayed_work() + flush_scheduled_work() ->
      cancel_delayed_work_sync().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
    Cc: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
    Cc: Duncan Sands <duncan.sands@xxxxxxx>
    Cc: linux-usb@xxxxxxxxxxxxxxx

commit 37c95bfe944babae817bfcf02c996729c9a3335d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    speedtch: don't abuse struct delayed_work
    
    speedtch directly uses the internal timer and work members of a struct
    delayed_work.  Use a separate work item and timer instead.
    
    * Nicolas Kaiser discovered that timer init was missing.  Fixed.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
    Tested-by: Nicolas Kaiser <nikai@xxxxxxxxx>
    Cc: Duncan Sands <duncan.sands@xxxxxxx>
    Cc: linux-usb@xxxxxxxxxxxxxxx

commit 8c71778cbf2c8beaefaa2dee5478aa0622d96682
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    media/video: don't use flush_scheduled_work()
    
    This patch converts the remaining users of flush_scheduled_work() in
    media/video.
    
    * bttv-input.c and cx23885-input.c don't use workqueue at all.  No
      need to flush.
    
    * Make omap24xxcam.c and saa7134-empress.c flush the used work
      directly.
    
    * In fd_defio.c, replace cancel_delayed_work() +
      flush_scheduled_work() with cancel_delayed_work_sync().  While at
      it, replace the deprecated cancel_rearming_delayed_work() with
      cancel_delayed_work_sync().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>

commit 707bcf326bd50c875d82bd2e7c31dcfb92b7e813
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    media/video: explicitly flush request_module work
    
    Video drivers request submodules using a work during probe and calls
    flush_scheduled_work() on exit to make sure the work is complete
    before being unloaded.  This patch makes these drivers flush the work
    directly instead of using flush_scheduled_work().
    
    While at it, relocate request_submodules() call in saa7134_initdev()
    right right before successful return as in other drivers to avoid
    failing after the work is scheduled and returning failure without the
    work still active.
    
    This is in preparation for the deprecation of flush_scheduled_work().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>

commit 883624a08cb4144343e7362d9fff0e2c69613ebf
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    ioc4: use static work_struct for ioc4_load_modules()
    
    There is no reason to dynamically allocate work_struct for
    ioc4_load_modules().  It makes the code more complex and makes it
    impossible to flush the work directly.  Use static work
    ioc4_load_modules_work instead and flush it directly on exit.
    
    This removes the use of flush_scheduled_work() which is being
    deprecated.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Brent Casavant <bcasavan@xxxxxxx>

commit ee4569a3a75e1a5ed53b0c4ff4d9fc456aa98ef1
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:14:20 2010 +0100

    init: don't call flush_scheduled_work() from do_initcalls()
    
    The call to flush_scheduled_work() in do_initcalls() is there to make
    sure all works queued to system_wq by initcalls finish before the init
    sections are dropped.
    
    However, the call doesn't make much sense at this point - there
    already are multiple different workqueues and different subsystems are
    free to create and use their own.  Ordering requirements are and
    should be expressed explicitly.
    
    Drop the call to prepare for the deprecation and removal of
    flush_scheduled_work().
    
    Andrew suggested adding sanity check where the workqueue code checks
    whether any pending or running work has the work function in the init
    text section.  However, checking this for running works requires the
    worker to keep track of the current function being executed, and
    checking only the pending works will miss most cases.  As a violation
    will almost always be caught by the usual page fault mechanism, I
    don't think it would be worthwhile to make the workqueue code track
    extra state just for this.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

commit 6dca467a76bb0ed71d65143b235e0ef80e44436f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:00:18 2010 +0100

    s390: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    
    * tape_3590: Create and use tape_3590_wq instead of the system_wq.
    
    * tape_block: Directly flush requeue_task on cleanup instead of using
      flush_scheduled_work().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
    Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
    Cc: linux390@xxxxxxxxxx
    Cc: linux-s390@xxxxxxxxxxxxxxx

commit 9db8995be5e1869b5effa117909bc285e06fc09b
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:00:17 2010 +0100

    rtc: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.  On
    removal, directly cancel the work, and flush the uie_task in
    rtc-dev.c::clear_uie().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
    Cc: rtc-linux@xxxxxxxxxxxxxxxx

commit 0d9ee5b2e9aac981fa063339daf04320eac610d1
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:00:17 2010 +0100

    mmc: update workqueue usages
    
    Workqueue creation API has been updated and flush_scheduled_work() is
    deprecated and scheduled to be removed.
    
    * core/core.c: Use alloc_ordered_workqueue() instead of
      create_singlethread_workqueue().  This removes an unnecessary
      rescuer.
    
    * host/omap.c: Create, use and flush mmc_omap_wq instead of the
      system_wq.
    
    * Flush host->mmc_carddetect_work directly on removal instead of using
      flush_scheduled_work().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Chris Ball <cjb@xxxxxxxxxx>
    Cc: linux-mmc@xxxxxxxxxxxxxxx

commit afdb32f2e463a195c104555ac9a8cdd39a2b6561
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:00:17 2010 +0100

    mfd: update workqueue usages
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    
    * In menelaus, flush menelaus->work directly on probe failure.  Also,
      make sure the work isn't running on removal.
    
    * In tps65010, cancel_delayed_work() + flush_scheduled_work() ->
      cancel_delayed_work_sync().  While at it, remove unnecessary (void)
      casts on return value, and use schedule_delayed_work() and
      to_delayed_work() instead of using delayed_work's internal work
      field.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 16:00:17 2010 +0100

    dvb: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    
    * Flush the used works directly.
    
    * Replace the deprecated cancel_rearming_delayed_work() +
      flush_scheduled_work() -> cancel_delayed_work_sync().
    
    * Make sure mantis->uart_work isn't running on exit.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
    Cc: linux-media@xxxxxxxxxxxxxxx

commit 99ef21216b4f85c56392ed41500d2f07f58cc360
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    leds-wm8350: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush led->work on removal instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Richard Purdie <rpurdie@xxxxxxxxx>

commit 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    mISDN: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush ch->workq when freeing channel and cancel it on
    release.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Karsten Keil <isdn@xxxxxxxxxxxxxx>
    Cc: netdev@xxxxxxxxxxxxxxx

commit d9c612eb6e9ccb8192e6c4d609dbbf178020c672
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    macintosh/ams: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush ams_info.worker on detach instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit a6665944ef83b6a2db8fc5b323c9fca92375a643
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    vmwgfx: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush info->deferred_work on removal instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Thomas Hellstrom <thellstrom@xxxxxxxxxx>

commit 2e5c44c92046c41607794666ffc0d6945945acb0
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    tpm: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush chip->work instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Debora Velarde <debora@xxxxxxxxxxxxxxxxxx>
    Cc: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>

commit 3514870f06a7907bc46361aebc3daf5ea4e97eeb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    sonypi: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush sonypi_device.input_work on removal instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Mattia Dongili <malattia@xxxxxxxx>

commit 42565999d1e0b8a0c5b4a0d475c26cf3d567e85e
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:07 2010 +0100

    hvsi: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly cancel hp->writer and flush hp->handshaker instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>

commit 30d65030fd14fd3696d927c5e452bee84c589b09
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    xen: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush info->work instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

commit 0ead5c86ac4c9903da93c76716135bc29d9cd83b
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    gdrom: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush work on removal instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Jens Axboe <axboe@xxxxxxxxx>

commit 8aa0f413848708bca329c52358ae7a1a0e395b4e
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    floppy: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush floppy_work instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Jens Axboe <axboe@xxxxxxxxx>

commit 539253f6e13feedfa7bb6a3112c6707ebdf11e74
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    sh: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush psw->work on removal instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
    Cc: linux-sh@xxxxxxxxxxxxxxx

commit fe413ec322e26179c788c678f24434b94cca34f0
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    arm/sharpsl: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush toggle_charger and sharpsl_bat works on suspend
    instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Russell King <linux@xxxxxxxxxxxxxxxx>

commit 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    ncpfs: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush the used works on stop instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Petr Vandrovec <petr@xxxxxxxxxxxxxx>

commit f094cfc6c382cec7b2c77dd7798576684153acbb
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    drm/ttm: use cancel_delayed_work_sync() in ttm_bo
    
    Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync()
    instead of calling cancel_delayed_work() followed by
    flush_scheduled_work().
    
    This is to prepare for the deprecation and removal of
    flush_scheduled_work().
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc:: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
    Cc:: Dave Airlie <airlied@xxxxxxxxxx>

commit 404437efc713b6c6fc8e2dc02978624bf4586e2d
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    pcmcia/ipwireless: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush the used works instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Jiri Kosina <jkosina@xxxxxxx>
    Acked-by: David Sterba <dsterba@xxxxxxx>

commit 9b00a8182987e8b7028d97c2bee3319ef383b57a
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    ocfs2: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    
    * cancel_delayed_work() + flush_schedule_work() ->
      cancel_delayed_work_sync().
    
    * flush qs->qs_work directly on exit instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Joel Becker <joel.becker@xxxxxxxxxx>
    Cc: Mark Fasheh <mfasheh@xxxxxxxx>

commit 7f6b0db9f63ba423d989e29f6318fe7e68760421
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    net/dsa: don't use flush_scheduled_work()
    
    flush_scheduled_work() is deprecated and scheduled to be removed.
    Directly flush dst->link_poll_work on remove instead.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>

commit 158fa67753e1eb3edfa5a2d1868666d89d1cf09f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:06 2010 +0100

    isdn/capi: make kcapi use a separate workqueue
    
    flush_scheduled_work() is deprecated and will be removed.  Because
    kcapi uses fire-and-forget type works, it's impossible to flush each
    work explicitly.  Create and use a dedicated workqueue instead.
    
    Please note that with recent workqueue changes, each workqueue doesn't
    reserve a lot of resources and using it as a flush domain is fine.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Jan Kiszka <jan.kiszka@xxxxxx>

commit 7fa5e85a0ab9ed5d2d8b77eec7976c88a5911bda
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Dec 24 15:59:05 2010 +0100

    isdn/capi: unregister capictr notifier after init failure
    
    capidrv_init() could leave capictr notifier dangling after init
    failure.  Fix it.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Acked-by: Jan Kiszka <jan.kiszka@xxxxxx>

commit 62bcb91573425975d6ad2389d7ab1d8feca88ab4
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 15:04:41 2010 +0100

    PM: Prototype the pm_generic_ operations
    
    The pm_generic_ operations are all exported but are not prototyped in any
    header file for direct use. Do so.
    
    [rjw: Added extern.]
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Fri Dec 24 15:04:06 2010 +0100

    PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
    
    The __pm_generic_resume() function changes the given device's runtime
    PM status to RPM_ACTIVE if its driver's callback returns 0, but it
    only should do that if the rumtime PM is enabled for the device.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Fri Dec 24 15:03:34 2010 +0100

    PM: Use dev_name() in core device suspend and resume routines
    
    Use dev_name() wherever applicable in drivers/base/power/main.c.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit b64959e6158d6dcb640fc22d7f43b94ad1c91135
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Thu Dec 16 17:11:45 2010 +0100

    PM: Permit registration of parentless devices during system suspend
    
    The registration of a new parentless device during system suspend
    will not lead to any complications affecting the PM core (the device
    will be effectively seen after the subsequent resume has completed),
    so remove the code used for detection of such events.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit b8c76f6aed0ab7df73a6410f3f82de2c831bb144
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Thu Dec 16 00:51:21 2010 +0100

    PM: Replace the device power.status field with a bit field
    
    The device power.status field is too complicated for its purpose
    (storing the information about whether or not the device is in the
    "active" state from the PM core's point of view), so replace it with
    a bit field and modify all of its users accordingly.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 5b219a51fdceaf76e0e18da57c7efb9e5586e567
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Thu Dec 16 00:51:08 2010 +0100

    PM: Remove redundant checks from core device resume routines
    
    Since a separate list of devices is used to link devices that have
    completed each stage of suspend (or resume), it is not necessary to
    check dev->power.status in the core device resume routines any more.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 8a43a9ab7b329aa8590f8a064df9bf8c80987507
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Thu Dec 16 00:50:30 2010 +0100

    PM: Use a different list of devices for each stage of device suspend
    
    Instead of keeping all devices in the same list during system suspend
    and resume, regardless of what suspend-resume callbacks have been
    executed for them already, use separate lists of devices that have
    had their ->prepare(), ->suspend() and ->suspend_noirq() callbacks
    executed.  This will allow us to simplify the core device suspend and
    resume routines.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 2cbb3ce1ad19e66858a4284dd6c4bb958162c483
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Wed Dec 15 00:17:29 2010 +0100

    PM: Avoid compiler warning in pm_noirq_op()
    
    The compiler complains that calltime may be uninitialized in
    pm_noirq_op(), so add extra initialization for that variable to
    avoid the warning.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit d83f905e126f8cbc5e4addc5d1a64aea785b732e
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Fri Dec 3 23:14:26 2010 +0100

    PM: Use pm_wakeup_pending() in __device_suspend()
    
    Before starting to suspend a device in __device_suspend() check if
    there's a request to abort the power transition and return -EBUSY
    in that case.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Fri Dec 3 22:58:31 2010 +0100

    PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
    
    To avoid confusion with the meaning and return value of
    pm_check_wakeup_events() replace it with pm_wakeup_pending() that
    will work the other way around (ie. return true when system-wide
    power transition should be aborted).
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 1e75227ef0571031cd18536ab768ee35667ec5b9
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Fri Dec 3 22:58:05 2010 +0100

    PM: Prevent dpm_prepare() from returning errors unnecessarily
    
    Currently dpm_prepare() returns error code if it finds that a device
    being suspended has a pending runtime resume request.  However, it
    should not do that if the checking for wakeup events is not enabled.
    On the other hand, if the checking for wakeup events is enabled, it
    can return error when a wakeup event is detected, regardless of its
    source.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 7ac4dcabdb482d4e74c9d36782d00bc6c4c01619
Author: Jon Mason <jon.mason@xxxxxxxx>
Date:   Wed Dec 1 00:14:55 2010 +0100

    PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
    
    basic-pm-debugging.txt is located in Documentation/power/ not
    Documents/power/.  Change the references in
    Documentation/power/drivers-testing.txt to reflect the location.
    
    Signed-off-by: Jon Mason <jon.mason@xxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit c7b61de5b7b17f0df34dc7d2f8b9576f8bd36fce
Author: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Date:   Wed Dec 1 00:14:42 2010 +0100

    PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
    
    This patch (as1431c) makes the synchronous runtime-PM interface
    suitable for use in interrupt handlers.  Subsystems can call the new
    pm_runtime_irq_safe() function to tell the PM core that a device's
    runtime_suspend and runtime_resume callbacks should be invoked with
    interrupts disabled and the spinlock held.  This permits the
    pm_runtime_get_sync() and the new pm_runtime_put_sync_suspend()
    routines to be called from within interrupt handlers.
    
    When a device is declared irq-safe in this way, the PM core increments
    the parent's usage count, so the parent will never be runtime
    suspended.  This prevents difficult situations in which an irq-safe
    device can't resume because it is forced to wait for its non-irq-safe
    parent.
    
    Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 5262a47502adcfc3a64403120768f528418a3b79
Author: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Date:   Fri Nov 26 23:07:56 2010 +0100

    PM / Hibernate: When failed, in_suspend should be reset
    
    When hibernation failed due to an error in swsusp_write() called by
    hibernate(), it skips calling "power_down()" and returns. When
    hibernate() is called again (probably after fixing up so that
    swsusp_write() wouldn't fail again), before "in_suspend = 1" of
    create_image is called, in_suspend should be 0. However, because
    hibernate() did not reset "in_suspend" after a failure, it's already 1.
    
    This patch fixes such inconsistency of "in_suspend" value.
    
    Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
    Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 5729c63a51f0f8a351e0f1dc7b3250ebac12c309
Author: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
Date:   Fri Nov 26 23:07:48 2010 +0100

    PM / Hibernate: hibernation_ops->leave should be checked too
    
    Because hibernate calls hibernation_ops->leave() without checking
    whether hibernation_ops->leave is NULL or not, hiberantion_set_ops
    should WARN_ON if hibernation_ops->leave is NULL.
    
    This patch added one more condition to check hibernation_ops->leave.
    
    Signed-off-by: MyungJoo Ham <myungjoo.ham@xxxxxxxxxxx>
    Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
    Acked-by: Pavel Machek <pavel@xxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Fri Nov 26 23:07:27 2010 +0100

    Freezer: Fix a race during freezing of TASK_STOPPED tasks
    
    After calling freeze_task(), try_to_freeze_tasks() see whether the
    task is stopped or traced and if so, considers it to be frozen;
    however, nothing guarantees that either the task being frozen sees
    TIF_FREEZE or the freezer sees TASK_STOPPED -> TASK_RUNNING
    transition.  The task being frozen may wake up and not see TIF_FREEZE
    while the freezer fails to notice the transition and believes the task
    is still stopped.
    
    This patch fixes the race by making freeze_task() always go through
    fake_signal_wake_up() for applicable tasks.  The function goes through
    the target task's scheduler lock and thus guarantees that either the
    target sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 133f1128b2bf178a1976b17c54bd14ce6feb90bf
Author: Tracey Dent <tdent48227@xxxxxxxxx>
Date:   Thu Nov 25 23:41:29 2010 +0100

    PM: Use proper ccflag flag in kernel/power/Makefile
    
    Use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is
    deprecated and should now be switched.  According to
    (documentation/kbuild/makefiles.txt).
    
    Signed-off-by: Tracey Dent <tdent48227@xxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 6675bc056790b403d198a173498d377187754142
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date:   Thu Nov 25 23:41:19 2010 +0100

    PM / Runtime: Fix comments to match runtime callback code
    
    Commit 05aa55dddb9ee4045c320661068bea78dad6a6e5 changed routines to
    succeed if the driver handler is not defined. Comments were not updated.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>

commit 30f2ba38011247ad95bffbf0743a0dc0656a5eb7
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 19:38:37 2010 +0900

    sh: intc: Initialize radix tree gfp mask explicitly.
    
    Presently the root node is initialized by way of kzalloc on the parent
    data structure, which by chance happens to do the bulk of what an
    explicit initialization does with GFP_NOWAIT semantics. This however is
    more by luck than by design, and as we ideally want to permit radix node
    allocations access to the emergency pools anyways, add in the proper
    initializer with the desired mask.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 1dee92bba36b491dbcc15e2cba40501403237f96
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 19:19:23 2010 +0900

    sh: Tidy up SH-4A unaligned load support.
    
    The current implementation was rather tied to the packed_struct.h
    definitions, which immediately began to clash when the packed_struct.h
    types changed and drivers began to include packed_struct.h directly.
    
    In order to support this sort of use it's necessary to get out of the way
    with regards to namespace collisions, and at the same time we can also
    kill off some duplicate code now that the unaligned headers are a bit
    more broken out.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 3d29005ab8d828e36108ecc2338612ce3acdd86f
Author: Shiraz Hashim <shiraz.hashim@xxxxxx>
Date:   Thu Dec 23 11:32:41 2010 +0100

    ARM: 6541/1: move sev definition to common system.h include file
    
    sev is used to send wakeup event to other cores in ARMv6K and above.
    This has been moved from platform specific part to standard common
    ARM header file (asm/system.h). Also introduced wfi() and wfe().
    
    Signed-off-by: Shiraz Hashim <shiraz.hashim@xxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 78368c79944b12f91bcacb0b0b030c36016264e8
Author: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 13:18:58 2010 +0100

    ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup
    
    Signed-off-by: srinidhi kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 67cfa23ac9df810d1fbf3a06b7f408243350ecfe
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Dec 21 10:42:20 2010 +0000

    Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable"
    
    This reverts commit 06c1088, as promised in the warning message.

commit dec12e62c03d26bbc7a142f067215a3a43cce7d0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Thu Dec 16 13:49:34 2010 +0000

    ARM: provide an early platform initialization hook
    
    This allows platforms to hook into the initialization early to setup
    things like scheduler clocks, etc.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 8ff1443c5439ecee7472b80cf12ecfc337e6ee98
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 20 10:18:36 2010 +0000

    ARM: simplify early machine init hooks
    
    Rather than storing each machine init hook separately, store a
    pointer to the machine description record and dereference this
    instead.  This pointer is only available while the init sections
    are present, which is not a problem as we only use it from init
    code.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit cd544ce754ac2432ffcc0626ea802d2b30876b50
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Wed Dec 22 13:20:08 2010 +0100

    ARM: 6538/1: Subarch IRQ handler macros V3
    
    Per subarch interrupt handler macros V3.
    
    This patch breaks out code from the irq_handler macro
    into arch_irq_handler and arch_irq_handler_default.
    
    The macros are put in the header file "entry-macro-multi.S"
    
    The arch_irq_handler_default macro is designed to be
    used by irq_handler in entry-armv.S while arch_irq_handler
    is suitable for per-subarch use.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 521086412ee423fbdfc7da81f257239c43f707b4
Author: eric miao <eric.y.miao@xxxxxxxxx>
Date:   Mon Dec 13 09:42:34 2010 +0100

    ARM: 6532/1: Allow machine to specify it's own IRQ handlers at run-time
    
    Normally different ARM platform has different way to decode the IRQ
    hardware status and demultiplex to the corresponding IRQ handler.
    This is highly optimized by macro irq_handler in entry-armv.S, and
    each machine defines their own macro to decode the IRQ number.
    However, this prevents multiple machine classes to be built into a
    single kernel.
    
    By allowing each machine to specify thier own handler, and making
    function pointer 'handle_arch_irq' to point to it at run time, this
    can be solved. And introduce CONFIG_MULTI_IRQ_HANDLER to allow both
    solutions to work.
    
    Comparing with the highly optimized macro of irq_handler, the new
    function must be written with care not to lose too much performance.
    And the IPI stuff on SMP is expected to move to the provided arch
    IRQ handler as well.
    
    The assembly code to invoke handle_arch_irq is optimized by Russell
    King.
    
    Signed-off-by: Eric Miao <eric.miao@xxxxxxxxxxxxx>
    Acked-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit d13e5edd7284bedcf5952e1b6490e39ad843cb91
Author: Todd Android Poynor <toddpoynor@xxxxxxxxxx>
Date:   Thu Dec 23 01:52:44 2010 +0100

    ARM: 6540/1: Stop irqsoff trace on return to user
    
    If the irqsoff tracer is in use, stop tracing the interrupt disable
    interval when returning to userspace.  Tracing userspace execution time
    as interrupts disabled time is not helpful for kernel performance
    analysis purposes.  Only do so if the irqsoff tracer is enabled, to
    avoid overhead for lockdep, which doesn't care.
    
    Signed-off-by: Todd Poynor <toddpoynor@xxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 875728807ff001b67a1e0535de5ad2cd3c41d47c
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 09:18:29 2010 +0100

    ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers
    
    Adding in self as maintainer for Nomadik and Ux500, I'm running
    an active -next tree for that stuff now. Extend file matchers to
    cover a few more relevant drivers and add git references.
    
    Cc: Alessandro Rubini <rubini@xxxxxxxx>
    Acked-by: Srinidhi Kasagar <srinidhi.kasagar@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 537de3a67c0c86586eacffde40673b727242dc3a
Author: Stephen Warren <swarren@xxxxxxxxxx>
Date:   Wed Dec 22 04:52:05 2010 +0100

    ARM: 6536/1: Add missing SZ_{32,64,128}
    
    ... and also remove misleading comment stating that this header is
    auto-generated.
    
    Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
    Acked-by: Uwe Kleine-Knig <u.kleine-koenig@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 206323c181371f3d5fab36c6d33e1fac09b61082
Merge: 25cf0398bdf365d027e171116aa4a281e9cd3c1c 
28bd2c341120db346f30b3ba11b4eac06b2cc981
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Fri Dec 24 09:36:37 2010 +0000

    Merge branch 'davinci-next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into 
devel-stable

commit 55271024a735d0c3234e6ca7e0914b05aab7fbac
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Nov 17 13:00:50 2010 +0100

    powerpc/pcm{030,032}: add pagesize to dts
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 45efe847971e6274a04eea75a0745d8015b54d37
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Nov 17 13:00:49 2010 +0100

    misc/at24: add more sanity checks for parameters
    
    Side-effects happen when passing 0 to either io_limit or page_size. Give
    an error in case of this misconfiguration.
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 9ed030d728f3bd03b6e869357da02725afda19a7
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Nov 17 13:00:48 2010 +0100

    misc/at24: parse device tree data
    
    Information about the pagesize and read-only-status may also come from
    the devicetree. Parse this data, too, and act accordingly. While we are
    here, change the initialization printout a bit. write_max is useful to
    know to detect performance bottlenecks, the rest is superfluous.
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 4bdac7da5237170b1392f39ebee99d235043fad8
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Fri Dec 17 15:33:58 2010 +0100

    spi/mpc52xx-spi: fix annotation for remove()-pointer
    
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 0dd2c96f19b0cffaeb437e50fa5da195920c6e78
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date:   Tue Dec 21 09:27:02 2010 +0800

    spi/fsl_espi: fix wrong setting of the address in the command buffer
    
    Or else we can't operate on the right address when the trans length
    is greater than 65535.
    
    Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit e6289d63a6f39237a027dcee46366ba158cb8406
Author: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
Date:   Tue Dec 21 09:26:07 2010 +0800

    spi/fsl_espi: change the read behaviour of the SPIRF
    
    The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the
    amount of data in the receive FIFO, so read the SPIRF byte by byte when
    the data in receive FIFO is less than 4 bytes.
    
    On Simics, when read N bytes that exceed the amount of data in receive
    FIFO, we can't read the data out, that is we can't clear the rx FIFO,
    then the CPU will loop on the espi rx interrupt.
    
    Signed-off-by: Mingkai Hu <Mingkai.hu@xxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 020862648445d7c1b12ea213c152f27def703f3b
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date:   Tue Nov 16 14:42:14 2010 -0800

    of/i2c: Fix request module by alias
    
    If we are registering an i2c device that has a device tree node like
    this real-world example:
    
          rtc@68 {
            compatible = "dallas,ds1337";
            reg = <0x68>;
          };
    
    of_i2c_register_devices() will try to load a module called ds1337.ko.
    There is no such module, so it will fail.  If we look in modules.alias
    we will find entries like these:
    
    .
    .
    .
    alias i2c:ds1339 rtc_ds1307
    alias i2c:ds1338 rtc_ds1307
    alias i2c:ds1337 rtc_ds1307
    alias i2c:ds1307 rtc_ds1307
    alias i2c:ds1374 rtc_ds1374
    .
    .
    .
    
    The module we want is really called rtc_ds1307.ko.  If we request a
    module called "i2c:ds1337", the userspace module loader will do the
    right thing (unless it is busybox) and load rtc_ds1307.ko.  So we add
    the I2C_MODULE_PREFIX to the request_module() string.
    
    Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 194588604765ac803f98fb9d19a36f6b835f4620
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date:   Wed Oct 27 18:03:47 2010 -0700

    of/mdio: Fix some endianness problems.
    
    In of_mdiobus_register(), the __be32 *addr variable is dereferenced.
    This will not work on little-endian targets.  Also since it is
    unsigned, checking for less than zero is redundant.
    
    Fix these two issues.
    
    Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
    [grant.likely@xxxxxxxxxxxx: removed goto]
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 7063c0d942a1af2993531fbe52b4c74c1db818c4
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date:   Fri Dec 24 13:59:11 2010 +0800

    spi/dw_spi: add DMA support
    
    dw_spi driver in upstream only supports PIO mode, and this patch
    will support it to cowork with the Designware dma controller used
    on Intel Moorestown platform, at the same time it provides a general
    framework to support dw_spi core to cowork with dma controllers on
    other platforms
    
    It has been tested with a Option GTM501L 3G modem and Infenion 60x60
    modem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled
    
    Also change the dma interface suggested by Linus Walleij.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
    [Typo fix and renames to match intel_mid_dma renaming]
    Signed-off-by: Vinod Koul <vinod.koul@xxxxxxxxx>
    Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 79290a2aa2fd1c179a285218472092475630dc0e
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date:   Fri Dec 24 13:59:10 2010 +0800

    spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
    
    Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit ebf45b7d029eb065819bfede8b30455630d76c68
Author: Feng Tang <feng.tang@xxxxxxxxx>
Date:   Fri Dec 24 13:59:09 2010 +0800

    spi/dw_spi: Fix too short timeout in spi polling loop
    
    The SPI polling loop timeout only works with HZ=100 as the loop was
    actually too short.
    
    Also add appropriate cpu_relax() in the busy wait loops...
    
    Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
    Signed-off-by: Alan Cox <alan@xxxxxxxxxxxxxxx>
    Signed-off-by: Feng Tang <feng.tang@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 5e8b821de333f472d33e3052a8dd1c43bf3ce433
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:13:59 2010 +0100

    spi/pl022: convert running variable
    
    This variable is a bool but defined an int and defined completely
    backwards. This makes the code more readable.
    
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit dec5a581eb5b7d1abc90885d897d2468f1e60b21
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:13:48 2010 +0100

    spi/pl022: convert busy flag to a bool
    
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 082086f2ce53c69260396e977d29972128def1d7
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:13:37 2010 +0100

    spi/pl022: pass the returned sglen to the DMA engine
    
    The sglen return by the dma_map_sg() should be passed to the DMA
    engine, not the one passed in. If we one day have a DMA mapper
    that can coalesce entries, this will bug due to a too large
    number of entries being passed in.
    
    Reported-by: Russell King <linux@xxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit b729889686afb7d4366e07fe9c2f7a2737166462
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:13:07 2010 +0100

    spi/pl022: map the buffers on the DMA engine
    
    The struct device for the DMA engine is the apropriate one to use
    when mapping/unmapping buffers. This is because the memory which
    is addressable by DMA is determined by the DMA engine rather than
    the device.
    
    Reported-by: Russell King <linux@xxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit acd0acb65ec907a9e872bbaa7ad811a518b49b45
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date:   Tue Dec 21 01:41:15 2010 +0000

    fb: fix overlapping test off-by-one.
    
    On my system with a radeon x2, the first GPU was not overlapping vesa
    but the test decided it was.
    
    Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
    Reviewed-by: Michel Dänzer <michel@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 9d32af66aa3a0e28d95fc607e208795ef6cc993a
Author: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
Date:   Fri Dec 24 11:40:50 2010 +0900

    spi/topcliff_pch: Fix data transfer issue
    
    It seems spi_topcliff_pch of linux-2.6.37-rc6 degraded by previous patch.
    In fact, data transfer fails on evaluation board testing.
    I found like the following register miss-setting line.
    Using this patch, I have confirmed data transfer can work well.
    
    Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 27f1acccd4d310e941d2e879445324595e2fe463
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 12:15:57 2010 +0900

    sh: Fix up SH7201 clkfwk build.
    
    The master clock initialization for SH7201 was wholly bogus. Users of the
    legacy API must initialize the clock rate through the struct clk itself
    rather than returning the clock frequency. Given that the init function
    itself is void, returning the frequency isn't terribly effective.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 29c185e5c681ca00d863d161eda7eadb93e32ee5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 12:08:30 2010 +0900

    nommu: Provide stubbed alloc/free_vm_area() implementation.
    
    Now that these have been introduced in to the vmalloc API, sync up the
    nommu side of things. At present we don't deal with VMAs as such, so for
    the time being these will simply BUG() out. In the future it should be
    possible to support this interface by layering on top of the vm_regions.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 9a14f653dfe349c0916e6a78c413effa2fa3f001
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 11:50:34 2010 +0900

    nommu: Fix up vmalloc_node() symbol export regression.
    
    Commit e1ca778 ("mm: add vzalloc() and vzalloc_node() helpers") ended up
    accidentally deleting the vmalloc_node() symbol export, resulting in:
    
    "vmalloc_node" [net/core/pktgen.ko] undefined!
    "vmalloc_node" [net/netfilter/x_tables.ko] undefined!
    
    regressions.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 27434f0af0fecba71fa58407715028d2b9550956
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 11:30:10 2010 +0900

    sh: mach-se: Fix up SE7206 build.
    
    With some recent tidying of duplicate register definitions the se7206 IRQ
    code broke:
    
    arch/sh/boards/mach-se/7206/irq.c: error: 'INTC_ICR' undeclared (first use 
in this function)
    arch/sh/boards/mach-se/7206/irq.c: error: (Each undeclared identifier is 
reported only once
    arch/sh/boards/mach-se/7206/irq.c: error: for each function it appears in.)
    
    Fix it up.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 638fa4aad5bbb75c8f0d558aa15dcb543de5fc31
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date:   Fri Dec 24 11:27:29 2010 +0900

    sh: Fix up SH4-202 clkfwk build.
    
    Some of the SH4-202 code was overlooked in the set_rate() API conversion,
    resulting in:
    
    arch/sh/kernel/cpu/sh4/clock-sh4-202.c: error: too many arguments to 
function 'clk->ops->set_rate'
    
    Fix it up.
    
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 893421745a052100b981401b7c5c6dc8708fb8a0
Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Date:   Wed Nov 24 10:05:46 2010 +0100

    spi/imx: remove autodetection
    
    There are no machines in-tree that still use the driver
    name as device name.  So save a few bytes and remove it.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Acked-by: Jason Wang <jason77.wang@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit eda4b716ea1f2a647a39cebae66b3fae4c4b80e4
Merge: 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5 
7d8f98769e7f4bc29c38789daeb416c6a7d7c241
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 16:36:48 2010 -0800

    Merge branch 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2: Fix system inodes cache overflow.
      ocfs2: Hold ip_lock when set/clear flags for indexed dir.
      ocfs2: Adjust masklog flag values
      Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read 
i_alloc_sem.
      ocfs2/dlm: Migrate lockres with no locks if it has a reference

commit 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5
Merge: 08861c713c1314d5b7329a290b5d53ad711112c3 
8a7411a24350bac141271755c66f40c56b0535ae
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 16:25:31 2010 -0800

    Merge branch 'linus-hot-fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'linus-hot-fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: fix on-line resizing regression

commit 08861c713c1314d5b7329a290b5d53ad711112c3
Merge: e82bb314eab2e25a7657f34450665160a5a6cc2b 
7693457547b729d9010a6014bbb8572b085f58d4
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 16:04:32 2010 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Fix GPIO2-fixup for Sony laptops
      ALSA: hda - Try to find an empty control index when it's occupied
      ALSA: hda - Fix conflict of d-mic capture volume controls
      ALSA: hda - Don't apply ALC269-specific initialization to ALC275
      ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
      ALSA: pcm: remember to always call va_end() on stuff that we va_start()
      ALSA: HDA: Add auto-mute for Thinkpad SL410/SL510

commit e82bb314eab2e25a7657f34450665160a5a6cc2b
Merge: 79534f237f05cac7f728cc957efdcc17603e38cd 
501aaa110a4269c99eff9736a81b5f93bb8b59be
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 15:59:23 2010 -0800

    Merge branch 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (21 commits)
      [media] mceusb: set a default rx timeout
      [media] mceusb: fix inverted mask inversion logic
      [media] mceusb: add another Fintek device ID
      [media] lirc_dev: fixes in lirc_dev_fop_read()
      [media] lirc_dev: stray unlock in lirc_dev_fop_poll()
      [media] rc: fix sysfs entry for mceusb and streamzap
      [media] streamzap: merge timeout space with trailing space
      [media] mceusb: fix keybouce issue after parser simplification
      [media] IR: add tv power scancode to rc6 mce keymap
      [media] mceusb: buffer parsing fixups for 1st-gen device
      [media] mceusb: fix up reporting of trailing space
      [media] nuvoton-cir: improve buffer parsing responsiveness
      [media] mceusb: add support for Conexant Hybrid TV RDU253S
      [media] s5p-fimc: Fix output DMA handling in S5PV310 IP revisions
      [media] s5p-fimc: Use correct fourcc code for 32-bit RGB format
      [media] s5p-fimc: Convert m2m driver to unlocked_ioctl
      [media] s5p-fimc: Explicitly add required header file
      [media] s5p-fimc: Fix vidioc_g_crop/cropcap on camera sensor
      [media] s5p-fimc: BKL lock removal - compilation fix
      [media] soc-camera: fix static build of the sh_mobile_csi2.c driver
      ...

commit 79534f237f05cac7f728cc957efdcc17603e38cd
Merge: 3fc5e98d8cf85e0d77fc597b49e9268dff67400e 
2ce494a3dac331fdbb2590e5fa0598956dd21b8b 
7f8595bfacef279f06c82ec98d420ef54f2537e0
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 15:39:40 2010 -0800

    Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf probe: Fix to support libdwfl older than 0.148
      perf tools: Fix lazy wildcard matching
      perf buildid-list: Fix error return for success
      perf buildid-cache: Fix symbolic link handling
      perf symbols: Stop using vmlinux files with no symbols
      perf probe: Fix use of kernel image path given by 'k' option
    
    * 'x86-fixes-for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, kexec: Limit the crashkernel address appropriately

commit 3fc5e98d8cf85e0d77fc597b49e9268dff67400e
Author: David Howells <dhowells@xxxxxxxxxx>
Date:   Wed Dec 22 16:24:13 2010 +0000

    KEYS: Don't call up_write() if __key_link_begin() returns an error
    
    In construct_alloc_key(), up_write() is called in the error path if
    __key_link_begin() fails, but this is incorrect as __key_link_begin() only
    returns with the nominated keyring locked if it returns successfully.
    
    Without this patch, you might see the following in dmesg:
    
        =====================================
        [ BUG: bad unlock balance detected! ]
        -------------------------------------
        mount.cifs/5769 is trying to release lock (&key->sem) at:
        [<ffffffff81201159>] request_key_and_link+0x263/0x3fc
        but there are no more locks to release!
    
        other info that might help us debug this:
        3 locks held by mount.cifs/5769:
         #0:  (&type->s_umount_key#41/1){+.+.+.}, at: [<ffffffff81131321>] 
sget+0x278/0x3e7
         #1:  (&ret_buf->session_mutex){+.+.+.}, at: [<ffffffffa0258e59>] 
cifs_get_smb_ses+0x35a/0x443 [cifs]
         #2:  (root_key_user.cons_lock){+.+.+.}, at: [<ffffffff81201000>] 
request_key_and_link+0x10a/0x3fc
    
        stack backtrace:
        Pid: 5769, comm: mount.cifs Not tainted 2.6.37-rc6+ #1
        Call Trace:
         [<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
         [<ffffffff81081601>] print_unlock_inbalance_bug+0xca/0xd5
         [<ffffffff81083248>] lock_release_non_nested+0xc1/0x263
         [<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
         [<ffffffff81201159>] ? request_key_and_link+0x263/0x3fc
         [<ffffffff81083567>] lock_release+0x17d/0x1a4
         [<ffffffff81073f45>] up_write+0x23/0x3b
         [<ffffffff81201159>] request_key_and_link+0x263/0x3fc
         [<ffffffffa026fe9e>] ? cifs_get_spnego_key+0x61/0x21f [cifs]
         [<ffffffff812013c5>] request_key+0x41/0x74
         [<ffffffffa027003d>] cifs_get_spnego_key+0x200/0x21f [cifs]
         [<ffffffffa026e296>] CIFS_SessSetup+0x55d/0x1273 [cifs]
         [<ffffffffa02589e1>] cifs_setup_session+0x90/0x1ae [cifs]
         [<ffffffffa0258e7e>] cifs_get_smb_ses+0x37f/0x443 [cifs]
         [<ffffffffa025a9e3>] cifs_mount+0x1aa1/0x23f3 [cifs]
         [<ffffffff8111fd94>] ? alloc_debug_processing+0xdb/0x120
         [<ffffffffa027002c>] ? cifs_get_spnego_key+0x1ef/0x21f [cifs]
         [<ffffffffa024cc71>] cifs_do_mount+0x165/0x2b3 [cifs]
         [<ffffffff81130e72>] vfs_kern_mount+0xaf/0x1dc
         [<ffffffff81131007>] do_kern_mount+0x4d/0xef
         [<ffffffff811483b9>] do_mount+0x6f4/0x733
         [<ffffffff8114861f>] sys_mount+0x88/0xc2
         [<ffffffff8100ac42>] system_call_fastpath+0x16/0x1b
    
    Reported-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
    Reviewed-and-Tested-by: Jeff Layton <jlayton@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 44658a11f312fb9217674cb90b1a11cbe17fd18d
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Tue Dec 21 13:04:52 2010 -0800

    cs5535-gpio: handle GPIO regs where higher (clear) bits are set
    
    The default for non-READ_BACK GPIO regs is to have the clear bits set;
    this means that our original errata fix was too simplistic.  This
    changes it to the following behavior:
    
     - when setting GPIOs, ignore the higher order bits (they're for
       clearing, we don't need to care about them).
    
     - when clearing GPIOs, keep all the bits, but unset (via XOR) the
       lower order bit that negates the clear bit that we care about.  That
       is, if we're clearing GPIO 26 (val = 0x04000000), we first XOR what's
       currently in the register with 0x0400 (GPIO 26's SET bit), and then
       OR that with the GPIO 26's CLEAR bit.
    
    Tested-by: Daniel Drake <dsd@xxxxxxxxxx>
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 001851659354cce436b749a793f3512a53394d80
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Tue Dec 21 13:04:42 2010 -0800

    cs5535-gpio: don't apply errata #36 to edge detect GPIOs
    
    The edge detect status GPIOs function differently from the other atomic
    model CS5536 GPIO registers; writing 1 to the high bits clears the GPIO,
    but writing 1 to the lower bits also clears the bit.
    
    This means that read-modify-write doesn't actually work for it, so don't
    apply the errata here.  If a negative edge status gets lost after
    resume..  well, we tried our best!
    
    Tested-by: Daniel Drake <dsd@xxxxxxxxxx>
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 0131d8973c8b9bd9d40fee8fae24eab24821efdb
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date:   Wed Dec 1 10:54:46 2010 +0100

    of/address: use proper endianess in get_flags
    
    This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and
    such. Those variables are pointing to the device tree which contains
    integers in big endian format.
    
    Most functions are doing it right because of_read_number() is doing the
    right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and
    of_bus_isa_map() were accessing the data directly and were doing it wrong.
    
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
    Acked-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit aa5cbf8a70f57c5360ce1bfef692b357c866ae7f
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:27 2010 -0800

    [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
    
    Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 900a36e3277ac9109fe364a6a1420c71265f9377
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:26 2010 -0800

    [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
    
    Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 0ce87911491d4167198b863c102c7e4d09202561
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:25 2010 -0800

    [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
    
    Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit bc5c2aad17b045ea28ab69e6149c8130ab20731e
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:24 2010 -0800

    [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX 
parts.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 7a44b86e777fc5d7a267df984d12b05fca59f487
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:23 2010 -0800

    [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command 
fails on CNAs.
    
    The semantics we employ now in the driver, performing a
    BIG_HAMMER in the event of Get-ID (0x20) mailbox command
    failing, should only be done for FC.  On FC configurations, it
    makes sense since advertising is only really performed once,
    so a BIG_HAMMER to reinitiate the process is needed to
    restart.  Under FCoE, this is not needed, as there's a
    continous stream of advertisements/ACks at the protocol layer
    to initiate a relogin/reinitialization process.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit f2019cb117f29ffaff961b5f6d5b3148d473de1d
Author: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:22 2010 -0800

    [SCSI] qla2xxx: Remove redundant module parameter permission bits
    
    For driver module parameters that have permission bits set to
    (S_IRUGO|S_IRUSR), remove the second term since it is already
    included in the first term.
    
    S_IRUGO comes defined as (S_IRUSR|S_IRGRP|S_IROTH).
    
    Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 794a5691147652387f4a2ffa890c5c1983e38849
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:21 2010 -0800

    [SCSI] qla2xxx: Add sysfs node for displaying board temperature.
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 10fbb7dd36eb3014fe4b928e596d89e036ee6210
Author: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:20 2010 -0800

    [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
    
    Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
    Signed-off-by: Lalit Chandivade <lalit.chandivade@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 710fc04da1abe48a33d54afb1ba33dbeceafb6e1
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date:   Wed Dec 22 11:57:29 2010 -0800

    microblaze/of: Use generic rule to build dtb's
    
    Modify arch/powerpc/boot/Makefile to use dtc command in
    scripts/Makefile.lib
    
    Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 63849340621f7f5f963e4a9b9ba76add3ad54612
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date:   Wed Dec 22 11:57:28 2010 -0800

    of/powerpc: Use generic rule to build dtb's
    
    Modify arch/powerpc/boot/Makefile to use dtc command in
    scripts/Makefile.lib
    
    Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit c9e8fd5cfb7de50139a8aa0f70f9fe03311cdd01
Author: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:19 2010 -0800

    [SCSI] qla2xxx: Fix for memory wedge on fw halt for ISP82XX
    
    Signed-off-by: Swapnil Nagle <swapnil.nagle@xxxxxxxxxx>
    Signed-off-by: Karen Higgins <karen.higgins@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 21090cbe95189d4ce6135fc8fec2f416b3eb227f
Author: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:18 2010 -0800

    [SCSI] qla2xxx: Update FCP priority information to firmware before sending 
IOs
    
    The FCP priority info was not being updated properly in certain situations.
    Here are the changes that needs to be done to take care of this issue:
    1. No need to check fcport->state for FCS_UNCONFIGURED in
    qla24xx_update_fcport_fcp_prio(), since an invalid loop id check is
    already performed which is sufficient.
    2. Add the missing qla24xx_update_fcport_fcp_prio() function call
    within qla2x00_update_fcport() function, so that the priority info
    is updated on every port addition or change.
    3. Perform proper adapter types checking.
    4. Other changes, associated with DEBUG/printk's and parameter passing.
    
    Signed-off-by: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
    Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
    Signed-off-by: Giridhar Malavali <giridhar.malavali@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 4052bd57234f119cef13b8997fcc852e2b2ce992
Author: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:17 2010 -0800

    [SCSI] qla2xxx: Fixed zero test on new_config in qla2x00_process_loopback().
    
    Fixed the incorrect zero test on array new_config[].
    
    Signed-off-by: Joe Carnuccio <joe.carnuccio@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit ff8073fffc708a4959c2dd159c834f2516ce9703
Author: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:16 2010 -0800

    [SCSI] qla2xxx: Populate FCP_PRIO location for no *FLT* case
    
    Signed-off-by: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 8ae598d02517af967685a671303c4ed10cded3c4
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Tue Dec 21 16:00:15 2010 -0800

    [SCSI] qla2xxx: list cursors are not null
    
    This is just a cleanup.
    
    The unneeded NULL check annoys static checkers because we already
    derefenced it and the we check it and then (if it's not the _safe()
    version) we dereference it again without checking.  And the static
    checker is all, "Wah?  Is it null or not?"
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit aab94339cd85d726abeae78fc02351fc1910e6a4
Author: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
Date:   Wed Dec 22 11:57:26 2010 -0800

    of: Add support for linking device tree blobs into vmlinux
    
    This patch adds support for linking device tree blob(s) into
    vmlinux. Modifies asm-generic/vmlinux.lds.h to add linking
    .dtb sections into vmlinux. To maintain compatiblity with the of/fdt
    driver code platforms MUST copy the blob to a non-init memory location
    before the kernel frees the .init.* sections in the image.
    
    Modifies scripts/Makefile.lib to add a kbuild command to
    compile DTS files to device tree blobs and a rule to create objects to
    wrap the blobs for linking.
    
    STRUCT_ALIGNMENT is defined in vmlinux.lds.h for use in the rule to
    create wrapper objects for the dtb in Makefile.lib.  The
    STRUCT_ALIGN() macro in vmlinux.lds.h is modified to use the
    STRUCT_ALIGNMENT definition.
    
    The DTB's are placed on 32 byte boundries to allow parsing the blob
    with driver/of/fdt.c during early boot without having to copy the blob
    to get the structure alignment GCC expects.
    
    A DTB is linked in by adding the DTB object to the list of objects to
    be linked into vmlinux in the archtecture specific Makefile using
       obj-y += foo.dtb.o
    
    Signed-off-by: Dirk Brandewie <dirk.brandewie@xxxxxxxxx>
    Acked-by: Michal Marek <mmarek@xxxxxxx>
    [grant.likely@xxxxxxxxxxxx: cleaned up whitespace inconsistencies]
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 579d12b58abb4bd1161728f0a4a2524258ecf0a3
Author: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
Date:   Tue Dec 21 16:00:14 2010 -0800

    [SCSI] qla2xxx: Added support for quiescence mode for ISP82xx.
    
    Support is added for quiescence mode. This feature is for P3P
    adapters. Any of the functions can put the firmware into quiescence
    state. All the others have to ack that request. During quiescence mode
    current commands are processed and all the new incoming I/Os are
    blocked. Loop resync is performed after firmware comes out of
    quiescence state.
    
    Signed-off-by: Saurav Kashyap <saurav.kashyap@xxxxxxxxxx>
    Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit d3bd058826aa8b79590cca6c8e6d1557bf576ada
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date:   Thu Dec 16 19:09:58 2010 -0800

    x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation
    
    Recent Intel new system have different order in MADT, aka will list all 
thread0
    at first, then all thread1.
    But SRAT table still old order, it will list cpus in one socket all 
together.
    
    If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have 
missed
    to put some cpus apic id to node mapping into apicid_to_node[].
    
    for example for 4 sockets system with 64 cpus with nr_cpus=32 will get 
crash...
    
    [    9.106288] Total of 32 processors activated (136190.88 BogoMIPS).
    [    9.235021] divide error: 0000 [#1] SMP
    [    9.235315] last sysfs file:
    [    9.235481] CPU 1
    [    9.235592] Modules linked in:
    [    9.245398]
    [    9.245478] Pid: 2, comm: kthreadd Not tainted 
2.6.37-rc1-tip-yh-01782-ge92ef79-dirty #274      /Sun Fire x4800
    [    9.265415] RIP: 0010:[<ffffffff81075a8f>]  [<ffffffff81075a8f>] 
select_task_rq_fair+0x4f0/0x623
    ...
    [    9.645938] RIP  [<ffffffff81075a8f>] select_task_rq_fair+0x4f0/0x623
    [    9.665356]  RSP <ffff88103f8d1c40>
    [    9.665568] ---[ end trace 2296156d35fdfc87 ]---
    
    So let just parse all cpu entries in SRAT.
    
    Also add apicid checking with MAX_LOCAL_APIC, in case We could out of 
boundaries of
    apicid_to_node[].
    
    it fixes following bug too.
    https://bugzilla.kernel.org/show_bug.cgi?id=22662
    
    -v2: expand to 32bit according to hpa
       need to add MAX_LOCAL_APIC for 32bit
    
    Reported-and-Tested-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
    Reported-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
    Tested-by: Myron Stowe <myron.stowe@xxxxxx>
    Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
    LKML-Reference: <4D0AD486.9020704@xxxxxxxxxx>
    Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>

commit 56d91f132c9be66e98cce1b1e77a28027048bb26
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
Date:   Thu Dec 16 19:09:24 2010 -0800

    x86, acpi: Add MAX_LOCAL_APIC for 32bit
    
    We should use MAX_LOCAL_APIC for max apic ids and MAX_APICS as number
    of local apics.
    
    Also apic_version[] array should use MAX_LOCAL_APICs.
    
    Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
    LKML-Reference: <4D0AD464.2020408@xxxxxxxxxx>
    Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>

commit 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Sat Dec 18 13:29:45 2010 +0100

    PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
    
    If pcie_ports_disabled is set, pcie_port_service_register() returns
    error code and select_detection_mode() should not attempt to
    unregister dummy_driver and use dummy_slots.  It should return
    PCIEHP_DETECT_ACPI immediately instead.
    
    Reviewed-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
    Acked-by: Kenji Kaneshige <kaneshige.kenji@xxxxxxxxxxxxxx>
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>

commit 6ec1e077e36c5469a6f901ca9abbd9bd5d23e6ae
Author: Felipe Balbi <balbi@xxxxxx>
Date:   Thu Dec 23 12:17:49 2010 -0800

    arm: omap: tusb6010: add name for MUSB IRQ
    
    commit fcf173e4511193b1efeccb0f22a8c641b464353b
    (add names for IRQs in structure resource)
    forgot to take care of tusb6010 making it
    fail to probe due to a missing resource.
    
    Fix it.
    
    Signed-off-by: Felipe Balbi <balbi@xxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 840b929680c0d79f5248724d1b6b6d3f2ca3159e
Author: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 12:17:48 2010 -0800

    arm: omap: craneboard: Add USB EHCI support
    
    AM3517/05 Craneboard has one EHCI interface on board using port1.
    
    GPIO35 is used as power enable.
    GPIO38 is used as port1 PHY reset.
    
    History:
    
http://marc.info/?l=linux-omap&w=2&r=1&s=Craneboard%253A%2BAdd%2BUSB%2BEHCI%2Bsupport&q=b
    
    Signed-off-by: Srinath <srinath@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Felipe Balbi <balbi@xxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit e058464990c2ef1f3ecd6b83a154913c3c06f02a
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Thu Dec 23 12:03:57 2010 -0800

    Revert "ipv4: Allow configuring subnets as local addresses"
    
    This reverts commit 4465b469008bc03b98a1b8df4e9ae501b6c69d4b.
    
    Conflicts:
    
        net/ipv4/fib_frontend.c
    
    As reported by Ben Greear, this causes regressions:
    
    > Change 4465b469008bc03b98a1b8df4e9ae501b6c69d4b caused rules
    > to stop matching the input device properly because the
    > FLOWI_FLAG_MATCH_ANY_IIF is always defined in ip_dev_find().
    >
    > This breaks rules such as:
    >
    > ip rule add pref 512 lookup local
    > ip rule del pref 0 lookup local
    > ip link set eth2 up
    > ip -4 addr add 172.16.0.102/24 broadcast 172.16.0.255 dev eth2
    > ip rule add to 172.16.0.102 iif eth2 lookup local pref 10
    > ip rule add iif eth2 lookup 10001 pref 20
    > ip route add 172.16.0.0/24 dev eth2 table 10001
    > ip route add unreachable 0/0 table 10001
    >
    > If you had a second interface 'eth0' that was on a different
    > subnet, pinging a system on that interface would fail:
    >
    >   [root@ct503-60 ~]# ping 192.168.100.1
    >   connect: Invalid argument
    
    Reported-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 8a7411a24350bac141271755c66f40c56b0535ae
Author: Theodore Ts'o <tytso@xxxxxxx>
Date:   Mon Dec 20 22:30:36 2010 -0500

    ext4: fix on-line resizing regression
    
    https://bugzilla.kernel.org/show_bug.cgi?id=25352
    
    This regression was caused by commit a31437b85: "ext4: use
    sb_issue_zeroout in setup_new_group_blocks", by accidentally dropping
    the code which reserved the block group descriptor and inode table
    blocks.
    
    Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>

commit e1928c86c4829703b800c81cc9edc939b5634e6f
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:43:04 2010 +0000

    cnic: Add FCoE support on 57712
    
    - Connection ID (cid) management
    - Slow-path command and response support
    - Update version to 2.2.11.
    
    Reviewed-by: Bhanu Prakash Gollapudi <bprakash@xxxxxxxxxxxx>
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e21ba414eed8a233eadb79bb6b158ac7ceb35025
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:43:03 2010 +0000

    cnic: Add kcq2 support on 57712
    
    The kcq2 (2nd kernel work queue) is used by FCoE on 57712 devices.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 42ecbb8426aa229167d7f9d4b4e20f24bf42cb24
Author: Eddie Wai <waie@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:43:02 2010 +0000

    cnic: Call cm_connect_complete() immediately on error
    
    If we get a path_resp error from userspace, call cm_connect_complete()
    immediately with error so that bnx2i can react to the error faster.
    
    Signed-off-by: Eddie Wai <waie@xxxxxxxxxxxx>
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit eaaa6e9c222d5c398488ed4216f0fd94e4b81759
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 08:38:30 2010 +0000

    cnic: Check device state before reading the kcq pointer in IRQ
    
    If the device is down, the kcq pointer may be NULL.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 4aacb7afb6afd78efe26427e74fa56a5fc72fad3
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:43:01 2010 +0000

    cnic: Support NIC Partition mode
    
    Add a common function cnic_read_bnx2x_iscsi_mac() to read the iSCSI
    MAC address at any specified shared memory location.  In NIC Partition
    mode, we need to get the MAC address from the MF_CFG area of shared
    memory.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 5159fdc1e6cb4000f482faebeeba0be91611276d
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:42:59 2010 +0000

    cnic: Use proper client and connection IDs on iSCSI ring
    
    Use the IDs specified by the bnx2x driver when initializing the ring.
    We don't have to make code changes when these IDs change in the future.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 939b82e5bde56a98c72eccde2e3a88d32bffad4a
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:42:58 2010 +0000

    cnic: Improve ->iscsi_nl_msg_send()
    
    1. Change first parameter from cnic_dev to ulp_handle which is the hba
    pointer.  All other similar upcalls are using hba pointer.  The callee
    can then directly reference the hba without conversion.
    
    2. Change return value from void to int so that an error code can be
    passed back.  This allows the operation to be retried.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 8adc9240f98a816f7e9b3d93b9446a790110e062
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:42:57 2010 +0000

    cnic: Prevent "scheduling while atomic" when calling ->cnic_init()
    
    cnic_dev_list is protected by rtnl_lock and cnic_dev_lock spin_lock during
    modifications.  When looping on cnic_dev_list and calling ->cnic_init(),
    we should just hold rtnl_lock since ->cnic_init() may sleep.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 9b09336072796378dac46df63bcd43291b24fd12
Author: Michael Chan <mchan@xxxxxxxxxxxx>
Date:   Thu Dec 23 07:42:56 2010 +0000

    cnic: Fix iSCSI TCP port endian order.
    
    Pass the TCP port parameter for iSCSI connections to the firmware in
    proper endian order.
    
    Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 5e2f55c6aaf4865081c46bf53664c8b5da8dc49e
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 16:42:55 2010 +0100

    powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
    
    Fix build errors like these (from a randconfig and my defconfig for a 
custom board):
    
    src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:549: error: dereferencing 
pointer to incomplete type: 1 errors in 1 logs
    src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:636: error: implicit 
declaration of function 'nonseekable_open': 1 errors in 1 logs
    src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:657: error: variable 
'mpc52xx_wdt_fops' has initializer but incomplete type: 1 errors in 1 logs
    src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: excess elements 
in struct initializer: 1 errors in 1 logs
    src/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:658: error: unknown field 
'owner' specified in initializer: 1 errors in 1 logs
    ...
    
    Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>

commit 0e214ad81545a35c5e62a4c2d6cf7275fd7a545f
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Fri Dec 17 03:25:43 2010 +0000

    USB: mcs7830: return negative if auto negotiate fails
    
    The original code returns 0 on success and 1 on failure.  In fact, at
    this point, "ret" is already either zero or a negative error code so
    we can just return it directly.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit a130883d9528eefb66285728ba6a232d8fff9465
Merge: d9f4fbaf7053af43e6c72909c2aff18654717aed 
65a6538a56d4c7ae8465f2a8420ddc65877b6779
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Thu Dec 23 10:13:30 2010 -0800

    Merge branch 'for-davem' of 
ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

commit fdac1e0697356ac212259f2147aa60c72e334861
Author: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
Date:   Wed Dec 22 13:58:27 2010 +0000

    irda: prevent integer underflow in IRLMP_ENUMDEVICES
    
    If the user-provided len is less than the expected offset, the
    IRLMP_ENUMDEVICES getsockopt will do a copy_to_user() with a very large
    size value.  While this isn't be a security issue on x86 because it will
    get caught by the access_ok() check, it may leak large amounts of kernel
    heap on other architectures.  In any event, this patch fixes it.
    
    Signed-off-by: Dan Rosenberg <drosenberg@xxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit d9f4fbaf7053af43e6c72909c2aff18654717aed
Author: Jiri Kosina <jkosina@xxxxxxx>
Date:   Wed Dec 22 23:23:38 2010 +0000

    tcp: cleanup of cwnd initialization in tcp_init_metrics()
    
    Commit 86bcebafc5e7f5 ("tcp: fix >2 iw selection") fixed a case
    when congestion window initialization has been mistakenly omitted
    by introducing cwnd label and putting backwards goto from the
    end of the function.
    
    This makes the code unnecessarily tricky to read and understand
    on a first sight.
    
    Shuffle the code around a little bit to make it more obvious.
    
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 1bde5ac49398a064c753bb490535cfad89e99a5f
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Thu Dec 23 09:32:46 2010 -0800

    tcp: fix listening_get_next()
    
    Alexey Vlasov found /proc/net/tcp could sometime loop and display
    millions of sockets in LISTEN state.
    
    In 2.6.29, when we converted TCP hash tables to RCU, we left two
    sk_next() calls in listening_get_next().
    
    We must instead use sk_nulls_next() to properly detect an end of chain.
    
    Reported-by: Alexey Vlasov <renton@xxxxxxxxxxx>
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit e1e359273576ee8fe27021356b064c772ed29af3
Author: David Sharp <dhsharp@xxxxxxxxxx>
Date:   Wed Dec 22 16:38:24 2010 -0800

    ring_buffer: Off-by-one and duplicate events in ring_buffer_read_page
    
    Fix two related problems in the event-copying loop of
    ring_buffer_read_page.
    
    The loop condition for copying events is off-by-one.
    "len" is the remaining space in the caller-supplied page.
    "size" is the size of the next event (or two events).
    If len == size, then there is just enough space for the next event.
    
    size was set to rb_event_ts_length, which may include the size of two
    events if the first event is a time-extend, in order to assure time-
    extends are kept together with the event after it. However,
    rb_advance_reader always advances by one event. This would result in the
    event after any time-extend being duplicated. Instead, get the size of
    a single event for the memcpy, but use rb_event_ts_length for the loop
    condition.
    
    Signed-off-by: David Sharp <dhsharp@xxxxxxxxxx>
    LKML-Reference: <1293064704-8101-1-git-send-email-dhsharp@xxxxxxxxxx>
    LKML-Reference: 
<AANLkTin7nLrRPc9qGjdjHbeVDDWiJjAiYyb-L=gH85bx@xxxxxxxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

commit 7693457547b729d9010a6014bbb8572b085f58d4
Merge: 5058cbf2c45c27e6f56f7a30b0bbe69efbd09936 
7039c74cb54652ba6d726ad4d2a42dbac95a97be
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Thu Dec 23 16:37:31 2010 +0100

    Merge branch 'fix/hda' into for-linus

commit 7039c74cb54652ba6d726ad4d2a42dbac95a97be
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Thu Dec 23 16:35:34 2010 +0100

    ALSA: hda - Fix GPIO2-fixup for Sony laptops
    
    The fix-up entries by the commit 2785591a9760c677a7ee6f541e751c23086f5bfd
         ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
    weren't applied in the right position.  They had to be before the quirk
    entry matching to all Sony devices.
    
    Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

commit 94462ad3b14739d158a1ab87bb30008c1e5a6bc1
Author: Steven Rostedt <rostedt@xxxxxxxxxxx>
Date:   Mon Nov 29 13:15:42 2010 -0500

    module: Move RO/NX module protection to after ftrace module update
    
    The commit:
    
    84e1c6bb38eb318e456558b610396d9f1afaabf0
    x86: Add RO/NX protection for loadable kernel modules
    
    Broke the function tracer with this output:
    
    ------------[ cut here ]------------
    WARNING: at kernel/trace/ftrace.c:1014 ftrace_bug+0x114/0x171()
    Hardware name: Precision WorkStation 470
    Modules linked in: i2c_core(+)
    Pid: 86, comm: modprobe Not tainted 2.6.37-rc2+ #68
    Call Trace:
     [<ffffffff8104e957>] warn_slowpath_common+0x85/0x9d
     [<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
     [<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
     [<ffffffff8104e989>] warn_slowpath_null+0x1a/0x1c
     [<ffffffff810a9dfe>] ftrace_bug+0x114/0x171
     [<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
     [<ffffffff810aa0db>] ftrace_process_locs+0x1ae/0x274
     [<ffffffffa00026db>] ? __process_new_adapter+0x7/0x34 [i2c_core]
     [<ffffffff810aa29e>] ftrace_module_notify+0x39/0x44
     [<ffffffff814405cf>] notifier_call_chain+0x37/0x63
     [<ffffffff8106e054>] __blocking_notifier_call_chain+0x46/0x5b
     [<ffffffff8106e07d>] blocking_notifier_call_chain+0x14/0x16
     [<ffffffff8107ffde>] sys_init_module+0x73/0x1f3
     [<ffffffff8100acf2>] system_call_fastpath+0x16/0x1b
    ---[ end trace 2aff4f4ca53ec746 ]---
    ftrace faulted on writing [<ffffffffa00026db>]
    __process_new_adapter+0x7/0x34 [i2c_core]
    
    The cause was that the module text was set to read only before ftrace
    could convert the calls to mcount to nops. Thus, the conversions failed
    due to not being able to write to the text locations.
    
    The simple fix is to move setting the module to read only after the
    module notifiers are called (where ftrace sets the module mcounts to nops).
    
    Reported-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Acked-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
    Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>

commit 104db7ff1d9d01a03a2568a156b19e1fd972e8bf
Merge: 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f 
32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Thu Dec 23 14:19:45 2010 +0100

    Merge branch 'perf/core' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

commit 394f4528c523d88daabd50f883a8d6b164075555
Merge: 90a8a73c06cc32b609a880d48449d7083327e11a 
3c2dcf2aed5ea22ecf65a9a871c4963faec421b3
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Thu Dec 23 12:57:04 2010 +0100

    Merge branch 'rcu/next' of 
git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into 
core/rcu

commit 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 14 19:21:29 2010 +0000

    drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
    
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

commit 63ee41d794d9c555f84205517a68509848988760
Author: Eric Anholt <eric@xxxxxxxxxx>
Date:   Mon Dec 20 18:40:06 2010 -0800

    drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
    
    The IPS driver is designed to be able to run detached from i915 and
    just not enable GPU turbo in that case, in order to avoid module
    dependencies between the two drivers.  This means that we don't know
    what the load order between the two is going to be, and we had
    previously only supported IPS after (optionally) i915, but not i915
    after IPS.  If the wrong order was chosen, you'd get no GPU turbo, and
    something like half the possible graphics performance.
    
    Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx

commit f797d22121404eac7b63f1291409f96bcab51c11
Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 23 09:43:48 2010 +0000

    drm/i915/sdvo: Add hdmi connector properties after initing the connector
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25012
    Reported-by: Tõnu Raitviir <jussuf@xxxxxxxx>
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

commit 06f37751af77192b424b2b0ff17dc08de65faba0
Author: Eric Anholt <eric@xxxxxxxxxx>
Date:   Tue Dec 14 10:06:46 2010 -0800

    drm/i915: Set the required VFMUNIT clock gating disable on Ironlake.
    
    It's required by the specs, but we don't know why.  Let's not find out
    why.
    
    Signed-off-by: Eric Anholt <eric@xxxxxxxxxx>
    Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

commit 5058cbf2c45c27e6f56f7a30b0bbe69efbd09936
Merge: 5aad6c5f7733b94e666e3bf8b57beb7bbee15886 
87a1c8aaa0bced8acf4cd64672362492460c31ae
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Thu Dec 23 10:28:26 2010 +0100

    Merge branch 'fix/misc' into for-linus

commit 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014
Author: Ajay Ramaswamy <ajay@xxxxxxxxxxxxx>
Date:   Thu Dec 23 01:19:39 2010 -0800

    Input: wacom - add support for digitizer in Lenovo W700
    
    Signed-off-by: Ajay Ramaswamy <ajay@xxxxxxxxxxxxx>
    Reviewed-by: Ping Cheng <pingc@xxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 1afe206ab6998ecd5f5485e02006b0578720a691
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Thu Dec 23 10:17:52 2010 +0100

    ALSA: hda - Try to find an empty control index when it's occupied
    
    When a mixer control element was already created with the given name,
    try to find another index for avoiding conflicts, instead of breaking
    with an error.  This makes the driver more robust.
    
    Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

commit ef8313bb1a22e7d2125d9d758aa8a81f1de91d81
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Thu Dec 23 01:19:38 2010 -0800

    Input: psmouse - disable the synaptics extension on OLPC machines
    
    OLPC has switched to a Synaptics touchpad.  It turns out that it's
    pretty useless in absolute mode.  This patch looks for an OLPC
    system (via DMI tables), and refuses to init Synaptics mode in
    that scenario (falling back to relative mode).
    
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 7ee99161a4febe53c906cb9becc596075fd6193e
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Thu Dec 23 01:18:28 2010 -0800

    Input: psmouse - fix up Synaptics comment
    
    Minor comment fixup for typos and grammar. Noticed while adding a
    separate workaround.
    
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>

commit 2d7ec12b902ae00920cee50d98757376b2fa9467
Author: Takashi Iwai <tiwai@xxxxxxx>
Date:   Thu Dec 23 10:16:05 2010 +0100

    ALSA: hda - Fix conflict of d-mic capture volume controls
    
    When the d-mics are assigned to the same purpose of another analog mic
    pins, the driver doesn't compute the index properly, resulting in an
    error with "existing control".  This patch fixes it.
    
    Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>

commit 26e20a108caca6231c6a5ec659f815a866904751
Merge: 691513f70d3957939a318da970987b876c720861 
90a8a73c06cc32b609a880d48449d7083327e11a
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Thu Dec 23 09:48:41 2010 +0100

    Merge commit 'v2.6.37-rc7' into x86/security

commit cfb13c5db08c90311a5defdde9a0328ee788cca5
Merge: 4b6ba8aacbb3185703b797286547d0f8f3859b02 
90a8a73c06cc32b609a880d48449d7083327e11a
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Thu Dec 23 00:41:14 2010 -0700

    Merge commit 'v2.6.37-rc7' into devicetree/next

commit 5f7bb3a439ce51ae8b92ca1dc93b91712224b69a
Author: adam radford <aradford@xxxxxxxxx>
Date:   Tue Dec 14 19:11:56 2010 -0800

    [SCSI] megaraid_sas: Documentation update
    
    The following patch updates the
    Documentation/scsi/ChangeLog.megaraid_sas file.
    
    Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 9c915a8c99bce637226aa09cb05fc18486b229cb
Author: adam radford <aradford@xxxxxxxxx>
Date:   Tue Dec 21 13:34:31 2010 -0800

    [SCSI] megaraid_sas: Add 9565/9285 specific code
    
    This patch adds MegaRAID 9265/9285 (Device id 0x5b) specific code
    
    Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit cd50ba8ede5cd3c4606a8e5d163913da5ff36ad7
Author: adam radford <aradford@xxxxxxxxx>
Date:   Tue Dec 21 10:23:23 2010 -0800

    [SCSI] megaraid_sas: Add struct megasas_instance_template changes
    
    The following patch adds struct megasas_instance_template changes to
    the megaraid_sas driver, and changes all code to use the new instance
    entries:
    
       irqreturn_t (*service_isr )(int irq, void *devp);
       void (*tasklet)(unsigned long);
       u32 (*init_adapter)(struct megasas_instance *);
       u32 (*build_and_issue_cmd) (struct megasas_instance *, struct scsi_cmnd 
*);
       void (*issue_dcmd) (struct megasas_instance *instance,
                                  struct megasas_cmd *cmd);
    
    Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit b6d5d8808b4c563a56414a4c4c6d652b5f87c088
Author: adam radford <aradford@xxxxxxxxx>
Date:   Tue Dec 14 18:56:07 2010 -0800

    [SCSI] megaraid_sas: Use lowest memory bar for SR-IOV VF support
    
    The following patch modifies the megaraid_sas driver to select the
    lowest memory bar available so the driver will work in SR-IOV VF
    environments where the memory bar mapping changes.
    
    Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 80d9da98b4034edd31f6bacdb96c7489c4460173
Author: adam radford <aradford@xxxxxxxxx>
Date:   Tue Dec 21 10:17:40 2010 -0800

    [SCSI] megaraid_sas: Add MSI-X support and msix_disable module parameter
    
    This patch adds MSI-X support and 'msix_disable' module parameter to
    the megaraid_sas driver.
    
    Signed-off-by: Adam Radford <aradford@xxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 46081b166415acb66d4b3150ecefcd9460bb48a1
Author: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Date:   Mon Dec 20 18:44:45 2010 +0200

    [SCSI] st: Increase success probability in driver buffer allocation
    
    Modify allocation to try the minimum possible page order allowed by the HBA
    scatter/gather segment limit in allocation of the driver's internal
    buffer. This increases the probability of successful allocation. The
    allocation may still fail if this minimum order is > 0.
    
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
    Signed-off-by: Kai Makisara <kai.makisara@xxxxxxxxxxx>
    Reported-by: Lukas Kolbe <lkolbe@xxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit 373daacfce9ea0091cb3027572354ddebefb8ebb
Author: Kai Makisara <Kai.Makisara@xxxxxxxxxxx>
Date:   Mon Dec 20 18:43:39 2010 +0200

    [SCSI] st: Store page order before driver buffer allocation
    
    The order of the pages allocated for the driver buffer must be stored before
    allocation because it is used in freeing already allocated pages if
    allocation fails.
    
    Signed-off-by: Kai Makisara <kai.makisara@xxxxxxxxxxx>
    Reported-by: Lukas Kolbe <lkolbe@xxxxxxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit a87e3a67d57472f40da2218793ff6d25c4518498
Author: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Date:   Fri Dec 17 19:16:06 2010 -0500

    [SCSI] scsi_debug: set resid to indicate no data-in when medium error
    
    set resid to the requested data-in length when a MEDIUM ERROR is
    simulated. This implies no valid data is returned in the data-in
    buffer
    
    Signed-off-by: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit a8733c7baf457b071528e385a0b7d4aaec79287c
Author: James Bottomley <James.Bottomley@xxxxxxx>
Date:   Fri Dec 17 15:36:34 2010 -0500

    [SCSI] fix medium error problems with some arrays which can cause data 
corruption
    
    Our current handling of medium error assumes that data is returned up
    to the bad sector.  This assumption holds good for all disk devices,
    all DIF arrays and most ordinary arrays.  However, an LSI array engine
    was recently discovered which reports a medium error without returning
    any data.  This means that when we report good data up to the medium
    error, we've reported junk originally in the buffer as good.  Worse,
    if the read consists of requested data plus a readahead, and the error
    occurs in readahead, we'll just strip off the readahead and report
    junk up to userspace as good data with no error.
    
    The fix for this is to have the error position computation take into
    account the amount of data returned by the driver using the scsi
    residual data.  Unfortunately, not every driver fills in this data,
    but for those who don't, it's set to zero, which means we'll think a
    full set of data was transferred and the behaviour will be identical
    to the prior behaviour of the code (believe the buffer up to the error
    sector).  All modern drivers seem to set the residual, so that should
    fix up the LSI failure/corruption case.
    
    Reported-by: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
    Cc: Stable Tree <stable@xxxxxxxxxx>
    Signed-off-by: James Bottomley <James.Bottomley@xxxxxxx>

commit e819eb8687767cefca7b6abf5ac6d5efcf581eeb
Merge: ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f 
0f16830e9f6de0a44cf1e473ffa80cbe612d5beb
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 19:47:37 2010 -0800

    Merge branch 'drm-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: Include the connector name in the output_poll_execute() debug message
      drm/radeon/kms: fix bug in r600_gpu_is_lockup
      drm/radeon/kms: reorder display resume to avoid problems
      drm/radeon/kms/evergreen: reset the grbm blocks at resume and init
      drm/radeon/kms: fix evergreen asic reset
      Revert "drm: Don't try and disable an encoder that was never enabled"
      drm/radeon: Add early unregister of firmware fb's
      drm/radeon: use aperture size not vram size for overlap tests
      drm/radeon/kms/evergreen: flush hdp cache when flushing gart tlb
      drm/radeon/kms: disable the r600 cb offset checker for linear surfaces
      drm/radeon/kms: disable ss fixed ref divide
      drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks
      agp/intel: Fix missed cached memory flags setting in i965_write_entry()
      drm/i915/sdvo: Only use the SDVO pin if it is in the valid range
      drm/i915/ringbuffer: Handle wrapping of the autoreported HEAD
      drm/i915/dp: Fix I2C/EDID handling with active DisplayPort to DVI 
converter

commit ca5f73a05ebfbf74ea9874d5eaad8d63d7e69b4f
Merge: 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43 
b93cef556162b0f33399bfe5f307c54f51554e09
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 19:47:04 2010 -0800

    Merge branch 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
    
    * 'for-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
      mfd: Support additional parent IDs for wm831x
      mfd: Fix ab8500-core interrupt ffs bit bug
      mfd: Supply IRQ base for WM832x devices
      watchdog: Fix null pointer dereference while accessing rdc321x 
platform_data
      gpio: Fix null pointer dereference while accessing rdc321x platform_data

commit 97dbf37d89b6d387a5fe79ffe3b72c37ec12db43
Author: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Date:   Tue Dec 21 17:24:31 2010 -0800

    drivers/spi/spi.c: don't release the spi device twice
    
    This was fixed by David Lamparter in v2.6.36-rc5 3486008 ("spi: free
    children in spi_unregister_master, not siblings") and broken again in
    v2.6.37-rc1~2^2~4 during the merge of 2b9603a0 ("spi: enable
    spi_board_info to be registered after spi_master").
    
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
    Signed-off-by: David Lamparter <equinox@xxxxxxxxxx>
    Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 4be2c95d1f7706ca0e74499f2bd118e1cee19669
Author: Jeff Mahoney <jeffm@xxxxxxxx>
Date:   Tue Dec 21 17:24:30 2010 -0800

    taskstats: pad taskstats netlink response for aligment issues on ia64
    
    The taskstats structure is internally aligned on 8 byte boundaries but the
    layout of the aggregrate reply, with two NLA headers and the pid (each 4
    bytes), actually force the entire structure to be unaligned.  This causes
    the kernel to issue unaligned access warnings on some architectures like
    ia64.  Unfortunately, some software out there doesn't properly unroll the
    NLA packet and assumes that the start of the taskstats structure will
    always be 20 bytes from the start of the netlink payload.  Aligning the
    start of the taskstats structure breaks this software, which we don't
    want.  So, for now the alignment only happens on architectures that
    require it and those users will have to update to fixed versions of those
    packages.  Space is reserved in the packet only when needed.  This ifdef
    should be removed in several years e.g.  2012 once we can be confident
    that fixed versions are installed on most systems.  We add the padding
    before the aggregate since the aggregate is already a defined type.
    
    Commit 85893120 ("delayacct: align to 8 byte boundary on 64-bit systems")
    previously addressed the alignment issues by padding out the pid field.
    This was supposed to be a compatible change but the circumstances
    described above mean that it wasn't.  This patch backs out that change,
    since it was a hack, and introduces a new NULL attribute type to provide
    the padding.  Padding the response with 4 bytes avoids allocating an
    aligned taskstats structure and copying it back.  Since the structure
    weighs in at 328 bytes, it's too big to do it on the stack.
    
    Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
    Reported-by: Brian Rogers <brian@xxxxxxxx>
    Cc: Jeff Mahoney <jeffm@xxxxxxxx>
    Cc: Guillaume Chazarain <guichaz@xxxxxxxxx>
    Cc: Balbir Singh <balbir@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 4e06fd14d5fa78826397c891654a37e5a36ee827
Author: Will Newton <will.newton@xxxxxxxxx>
Date:   Tue Dec 21 17:24:29 2010 -0800

    include/linux/unaligned: pack the whole struct rather than just the field
    
    The current packed struct implementation of unaligned access adds the
    packed attribute only to the field within the unaligned struct rather than
    to the struct as a whole.  This is not sufficient to enforce proper
    behaviour on architectures with a default struct alignment of more than
    one byte.
    
    For example, the current implementation of __get_unaligned_cpu16 when
    compiled for arm with gcc -O1 -mstructure-size-boundary=32 assumes the
    struct is on a 4 byte boundary so performs the load of the 16bit packed
    field as if it were on a 4 byte boundary:
    
    __get_unaligned_cpu16:
            ldrh    r0, [r0, #0]
            bx      lr
    
    Moving the packed attribute to the struct rather than the field causes the
    proper unaligned access code to be generated:
    
    __get_unaligned_cpu16:
        ldrb    r3, [r0, #0]    @ zero_extendqisi2
        ldrb    r0, [r0, #1]    @ zero_extendqisi2
        orr     r0, r3, r0, asl #8
        bx      lr
    
    Signed-off-by: Will Newton <will.newton@xxxxxxxxx>
    Cc: Arnd Bergmann <arnd@xxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 91facc22dec964683aef88f5620a790a6e46b98a
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Tue Dec 21 17:24:28 2010 -0800

    led_class: fix typo in blink API
    
    When I added led_blink_set I had a typo: the return value of the hw
    offload is a regular error code that is zero when succesful, and in that
    case software emulation should not be used, rather than the other way
    around.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Cc: Richard Purdie <rpurdie@xxxxxxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 5a2d6e31c683b361b5012aec1768c994fea3f25a
Author: Axel Lin <axel.lin@xxxxxxxxx>
Date:   Tue Dec 21 17:24:27 2010 -0800

    backlight: cr_bllcd.c: fix a memory leak
    
    Signed-off-by: Axel Lin <axel.lin@xxxxxxxxx>
    Cc: Thomas Hellstrom <thomas@xxxxxxxxxxxxxxxxxxxx>
    Cc: Alan Hourihane <alanh@xxxxxxxxxxxxxxxxxxxx>
    Cc: Richard Purdie <rpurdie@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 0d1836c366157994474afd29632992375a3dd20c
Author: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
Date:   Tue Dec 21 17:24:26 2010 -0800

    mm/migrate.c: fix compilation error
    
    GCC complained about update_mmu_cache() not being defined in migrate.c.
    Including <asm/tlbflush.h> seems to solve the problem.
    
    Signed-off-by: Michal Nazarewicz <m.nazarewicz@xxxxxxxxxxx>
    Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 118364948fad7b6c0469ef2d3ddaee447d7a0b5f
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date:   Tue Dec 21 17:24:24 2010 -0800

    rtc: rs5c372: fix buffer size
    
    Match the buffer size to the amount of initialized values.  Before, it was
    one too big and thus destroyed the neighbouring register causing the clock
    to run at false speeds.
    
    Reported-by: Andre van Rooyen <a.v.rooyen@xxxxxxxxx>
    Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
    Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
    Cc: <stable@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 6900609612d26ca6ba11935613aa9db112613a48
Author: Andres Salomon <dilinger@xxxxxxxxxx>
Date:   Tue Dec 21 17:24:23 2010 -0800

    MAINTAINERS: update geode entry
    
    Remove Jordan as the geode maintainer (he's not been interested in geode for
    some time), and add myself as the maintainer.
    
    Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
    Cc: Daniel Drake <dsd@xxxxxxxxxx>
    Cc: Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx>
    Cc: Chris Ball <cjb@xxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit e254811c205ec539b648cff54a7852ee8dcd2e5e
Author: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
Date:   Tue Dec 21 17:24:22 2010 -0800

    gpiolib: gpio_request_one(): add missing gpio_free()
    
    If GPIO request succeeds, but configuration fails, it should be released.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
    Acked-by: Eric Miao <eric.miao@xxxxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit d153ba64450b9371158c6516d6cac120faace44c
Author: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Date:   Tue Dec 21 17:24:21 2010 -0800

    writeback: do uninterruptible sleep in balance_dirty_pages()
    
    Using TASK_INTERRUPTIBLE in balance_dirty_pages() seems wrong.  If it's
    going to do that then it must break out if signal_pending(), otherwise
    it's pretty much guaranteed to degenerate into a busywait loop.  Plus we
    *do* want these processes to appear in D state and to contribute to load
    average.
    
    So it should be TASK_UNINTERRUPTIBLE.                 -- Andrew Morton
    
    Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit f06328d7721ad3852c45eb2a10a0c8f9439b5f33
Author: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Date:   Tue Dec 21 17:24:20 2010 -0800

    logfs: fix "Kernel BUG at readwrite.c:1193"
    
    This happens when __logfs_create() tries to write a new inode to the disk
    which is full.
    
    __logfs_create() associates the transaction pointer with inode.  During
    the logfs_write_inode() function call chain this transaction pointer is
    moved from inode to page->private using function move_inode_to_page
    (do_write_inode() -> inode_to_page() -> move_inode_to_page)
    
    When the write inode fails, the transaction is aborted and iput is called
    on the failed inode.  During delete_inode the same transaction pointer
    associated with the page is getting used.  Thus causing kernel BUG.
    
    The patch checks for error in write_inode() and restores the page->private
    to NULL.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=20162
    
    Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
    Cc: Joern Engel <joern@xxxxxxxxx>
    Cc: Florian Mickler <florian@xxxxxxxxxxx>
    Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
    Cc: Maciej Rutecki <maciej.rutecki@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit eabb26cacdec33ca6f6fcaee762b57c2205169ca
Author: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Date:   Tue Dec 21 17:24:19 2010 -0800

    logfs: fix deadlock in logfs_get_wblocks, hold and wait on 
super->s_write_mutex
    
    do_logfs_journal_wl_pass() should use GFP_NOFS for memory allocation GC
    code calls btree_insert32 with GFP_KERNEL while holding a mutex
    super->s_write_mutex.
    
    The same mutex is used in address_space_operations->writepage(), and a
    call to writepage() could be triggered as a result of memory allocation
    in btree_insert32, causing a deadlock.
    
    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=20342
    
    Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
    Cc: Joern Engel <joern@xxxxxxxxx>
    Cc: Florian Mickler <florian@xxxxxxxxxxx>
    Cc: "Rafael J. Wysocki" <rjw@xxxxxxx>
    Cc: Maciej Rutecki <maciej.rutecki@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 7a2d19bced51af31d2c9ff55219400ed0a6c012f
Author: Mel Gorman <mel@xxxxxxxxx>
Date:   Tue Dec 21 17:24:18 2010 -0800

    mm: vmscan: tracepoint: account for scanned pages similarly for both ftrace 
and vmstat
    
    When correlating ftrace results with /proc/vmstat, I noticed that the
    reporting scripts value for "pages scanned" differed significantly.  Both
    values were "right" depending on how you look at it.
    
    The difference is due to vmstat only counting scanning of the inactive
    list towards pages scanned.  The analysis script for the tracepoint counts
    active and inactive list yielding a far higher value than vmstat.  The
    resulting scanning/reclaim ratio looks much worse.  The tracepoint is ok
    but this patch updates the reporting script so that the report values for
    scanned are similar to vmstat.
    
    Signed-off-by: Mel Gorman <mel@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit dd9e5efe3aa9fc5b1ce484a531ecdba3a7a30bbf
Author: Minchan Kim <minchan.kim@xxxxxxxxx>
Date:   Tue Dec 21 17:24:16 2010 -0800

    mm/compaction.c: avoid double mem_cgroup_del_lru()
    
    del_page_from_lru_list() already called mem_cgroup_del_lru().  So we must
    not call it again.  It adds unnecessary overhead.
    
    It was not a runtime bug because the TestClearPageCgroupAcctLRU() early in
    mem_cgroup_del_lru_list() will prevent any double-deletion, etc.
    
    Signed-off-by: Minchan Kim <minchan.kim@xxxxxxxxx>
    Acked-by: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
    Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
    Acked-by: Mel Gorman <mel@xxxxxxxxx>
    Reviewed-by: Johannes Weiner <hannes@xxxxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>

commit 0b50c691f93a973136dc821ef11372ffdfae9646
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 18:42:36 2010 -0800

    omap2+: Initialize serial port for dynamic remuxing for n8x0
    
    Use omap_serial_init_port so we can let the serial code handle the
    remuxing of the RX pads. Note that this patch alone is not enough
    and additional GPIO related patches are needed.
    
    Only initialize uart3_rx_irrx pin, the other uart pins can be
    stay static.
    
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 40e44399301b6dbd997408a184140b79b77f632d
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 18:42:35 2010 -0800

    omap2+: Add struct omap_board_data and use it for platform level serial init
    
    This is needed to pass board specific data such as pads used to the
    platform level driver init code.
    
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 8d9af88f55be89fa4c897ded3204ef12c947731e
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 18:42:35 2010 -0800

    omap2+: Allow hwmod state changes to mux pads based on the state changes
    
    Allow hwmod state changes to mux pads based on the state changes.
    
    By default, only enable and disable the pads. In some rare cases
    dynamic remuxing for the idles states is needed, this can be done
    by passing the enable, idle, and off pads from board-*.c file along
    with OMAP_DEVICE_PAD_REMUX flag.
    
    Thanks to Paul Walmsley <paul@xxxxxxxxxxx> for the comments on the
    hwmod related changes.
    
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 9796b323b5a1940f9ec62c3a6cf7e442bf540d53
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 18:42:35 2010 -0800

    omap2+: Add support for hwmod specific muxing of devices
    
    This allows adding hwmod specific pads dynamically during the
    platform device init.
    
    Note that we don't currently have the hwmod specific signals
    listed in the hwmod data, but struct omap_hwmod_mux_info will
    make that possible if necessary.
    
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 8419fdbaf2118a0a169441be82f09f7be93a5ca1
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 18:42:35 2010 -0800

    omap2+: Add omap_mux_get_by_name
    
    Do this by splitting _omap_mux_init_signal as it already has most
    of the necessary features.
    
    Based on an earlier patch by Dan Murphy <dmurphy@xxxxxx>.
    
    Cc: Dan Murphy <dmurphy@xxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit b7e03ec9a6b9d0c0cb1e435026d46dfcd78e48ac
Merge: 762e30239cce9ff0d82227ade663feed2f6283d8 
b51aff057c9d0ef6c529dc25fd9f775faf7b6c63
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date:   Wed Dec 22 17:34:40 2010 -0800

    Merge branch 'master' of 
ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 17f9cc3124c97f50a19a7597e5f29f915b5b835c
Author: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:00:34 2010 -0200

    Bluetooth: Improve handling of HCI control channel in bind
    
    Does not allow any channel different of HCI_CHANNEL_RAW and
    HCI_CHANNEL_CONTROL to bind.
    
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit 23bb57633df97ede067ea26f3cdc8a7ba2cd8109
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Tue Dec 21 23:01:27 2010 +0200

    Bluetooth: Fix __hci_request synchronization for hci_open_dev
    
    The initialization function used by hci_open_dev (hci_init_req) sends
    many different HCI commands. The __hci_request function should only
    return when all of these commands have completed (or a timeout occurs).
    Several of these commands cause hci_req_complete to be called which
    causes __hci_request to return prematurely.
    
    This patch fixes the issue by adding a new hdev->req_last_cmd variable
    which is set during the initialization procedure. The hci_req_complete
    function will no longer mark the request as complete until the command
    matching hdev->req_last_cmd completes.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit c71e97bfaadfa727669fcfcf12301744fd169091
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Mon Dec 13 21:07:07 2010 +0200

    Bluetooth: Add management events for controller addition & removal
    
    This patch adds Bluetooth Management interface events for controller
    addition and removal. The events correspond to the existing HCI_DEV_REG
    and HCI_DEV_UNREG stack internal events.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit f7b64e69c7c75c8e9f2d5e23edec8de1ce883bcc
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Mon Dec 13 21:07:06 2010 +0200

    Bluetooth: Add read_info management command
    
    This patch implements the read_info command which is used to fetch basic
    info about an adapter.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit faba42eb2a8cf905ed26d540c3c93d429e327224
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Mon Dec 13 21:07:05 2010 +0200

    Bluetooth: Add read_index_list management command
    
    This patch implements the read_index_list command through which
    userspace can get a list of current adapter indices.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit 02d981292ad3149e8e5f37cffbccedab1a8576d8
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Mon Dec 13 21:07:04 2010 +0200

    Bluetooth: Add read_version management command
    
    This patch implements the initial read_version command that userspace
    will use before any other management interface operations.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit e41d8b4e131a41f2a3b74aaa783b16aa46376d8e
Author: Johan Hedberg <johan.hedberg@xxxxxxxxx>
Date:   Mon Dec 13 21:07:03 2010 +0200

    Bluetooth: Add error handling for managment command handlers
    
    The command handlers for bluetooth management messaging should be able
    to report errors (such as memory allocation failures) to the higher
    levels in the call stack.
    
    Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx>
    Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
    Signed-off-by: Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx>

commit 762e30239cce9ff0d82227ade663feed2f6283d8
Author: Rafael J. Wysocki <rjw@xxxxxxx>
Date:   Wed Dec 22 03:07:52 2010 +0000

    atl1c: Do not use legacy PCI power management
    
    The atl1c driver uses the legacy PCI power management, so it has to
    do some PCI-specific things in its ->suspend() and ->resume()
    callbacks and they are not done correctly.
    
    Convert atl1c to the new PCI power management framework and make it
    let the PCI subsystem handle all of the PCI-specific aspects of
    device handling during system power transitions.
    
    Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit f622691c91cd1bb27d03a5caa8a43822572c62bc
Author: Tomoya <tomoya-linux@xxxxxxxxxxxxxxx>
Date:   Wed Dec 22 03:00:39 2010 +0000

    pch_can: Fix array miss-pointing issue
    
    Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 05fad3e72e98e57274b8930a08f8b476048f5022
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 23:04:17 2010 +0000

    OMAP2: PM: fix compile error when !CONFIG_SUSPEND
    
    When CONFIG_SUSPEND is not enabled, none of the system PM methods are
    used, so do not compile them in.
    
    Thanks to Charles Manning for reporting the problem and proposing
    an initial patch.
    
    Reported-by: Charles Manning <manningc2@xxxxxxxxxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 1c4655651f1377297425525b250b2e4b5462015b
Merge: f400c82efb474b2ccf01c796b60b36408f7845a3 
b35cecf978e33bf8f4be0f36ffe00fe10f381c4a
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 15:08:05 2010 -0800

    Merge branch 'pm-sr' of 
ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 
omap-for-linus

commit f400c82efb474b2ccf01c796b60b36408f7845a3
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Mon Dec 6 19:08:54 2010 -0700

    MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
    
    Add myself and Benoît as co-maintainers of the OMAP hwmod core code.
    (The OMAP hwmod code manages the integration of IP blocks on the OMAP SoC
    family.)
    
    Add Benoît as the maintainer of OMAP4-based SoC hwmod mode.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Signed-off-by: Benoît Cousson <b-cousson@xxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 25cf0398bdf365d027e171116aa4a281e9cd3c1c
Merge: 9326845f45650f6af9953a4b6a31e89b54fab82f 
59bdd133561a432c4655146e283caf85fa64c2fb
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 22:46:24 2010 +0000

    Merge branch 'devel' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into 
devel-stable

commit 09c85a440d113a8e6f32bc616423d7684970c37c
Merge: ee81e7a0a86a3b40837de4a5f514c2d3758af20e 
a74b74a5555c741ed3df896096e33b853995631e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 22 22:45:48 2010 +0000

    Merge branch 'fix' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

commit 1da0c89c66753860ccfe81eb327c25db46c2a24a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:56:47 2010 +0000

    ARM: versatile: convert sched_clock() to use new infrastructure
    
    Convert versatile platforms to use the new sched_clock() infrastructure
    for extending 32bit counters to full 64-bit nanoseconds.
    
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit f06a1624621527ef597ae4b3b795553fc1b2eff2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:55:06 2010 +0000

    ARM: orion: convert sched_clock() to use new infrastructure
    
    Convert orion platforms to use the new sched_clock() infrastructure for
    extending 32bit counters to full 64-bit nanoseconds.
    
    Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit dc548fbbd2ecd0fc3b02301d551e5f8e19ae58fd
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:53:51 2010 +0000

    ARM: omap: convert sched_clock() to use new infrastructure
    
    Convert omap to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit ec05aa139939d9c7b790041a379f0e752b2f1a4d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:53:02 2010 +0000

    ARM: nomadik: convert sched_clock() to use new infrastructure
    
    Convert nomadik platforms to use the new sched_clock() infrastructure
    for extending 32bit counters to full 64-bit nanoseconds.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 08f26b1ef25a2f7b52afcb805d260fd5a000a7f6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:52:10 2010 +0000

    ARM: iop: convert sched_clock() to use new infrastructure
    
    Convert iop platforms to use the new sched_clock() infrastructure for
    extending 32bit counters to full 64-bit nanoseconds.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5c21b7ca2c1cca3758a1d357dd57987c96ad1aa0
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:50:14 2010 +0000

    ARM: u300: convert sched_clock() to use new infrastructure
    
    Convert u300 to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit e3f4c0ab916334e861fc49eeb2673a8c13e978e7
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:49:42 2010 +0000

    ARM: tegra: convert sched_clock() to use new infrastructure
    
    Convert tegra to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Tested-by: Olof Johansson <olof@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5094b92f1c7d0f21c5d4411ba7415bac0684210f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:49:06 2010 +0000

    ARM: sa1100: convert sched_clock() to use new infrastructure
    
    Convert sa1100 to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 7ce830188199c23aaeaf0c5ccc28b73c32b6df02
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:48:15 2010 +0000

    ARM: pxa: convert sched_clock() to use new infrastructure
    
    Convert pxa to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 28bb7bc61a8cd48716d38d9c153fdc524f09870a
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:46:48 2010 +0000

    ARM: mmp: convert sched_clock() to use new infrastructure
    
    Convert mmp to use the new sched_clock() infrastructure for extending
    32bit counters to full 64-bit nanoseconds.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5b0d495c067d843c52fc1f9edbca29d5e9368b10
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 21:23:13 2010 +0000

    ARM: ixp4xx: convert sched_clock() to use new infrastructure
    
    Convert ixp4xx to use the new sched_clock() infrastructure for
    extending 32bit counters to full 64-bit nanoseconds.
    
    Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 112f38a4a31668eb6a7d91d128296a26afdf7c4b
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 19:23:07 2010 +0000

    ARM: sched_clock: provide common infrastructure for sched_clock()
    
    Provide common sched_clock() infrastructure for platforms to use to
    create a 64-bit ns based sched_clock() implementation from a counter
    running at a non-variable clock rate.
    
    This implementation is based upon maintaining an epoch for the counter
    and an epoch for the nanosecond time.  When we desire a sched_clock()
    time, we calculate the number of counter ticks since the last epoch
    update, convert this to nanoseconds and add to the epoch nanoseconds.
    
    We regularly refresh these epochs within the counter wrap interval.
    We perform a similar calculation as above, and store the new epochs.
    
    We read and write the epochs in such a way that sched_clock() can easily
    (and locklessly) detect when an update is in progress, and repeat the
    loading of these constants when they're known not to be stable.  The
    one caveat is that sched_clock() is not called in the middle of an
    update.  We achieve that by disabling IRQs.
    
    Finally, if the clock rate is known at compile time, the counter to ns
    conversion factors can be specified, allowing sched_clock() to be tightly
    optimized.  We ensure that these factors are correct by providing an
    initialization function which performs a run-time check.
    
    Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
    Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
    Tested-by: Olof Johansson <olof@xxxxxxxxx>
    Tested-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
    Reviewed-by: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit b5776c4a6d0afc13697e8452b9ebe1cc4d961b74
Author: john stultz <johnstul@xxxxxxxxxx>
Date:   Thu Dec 16 19:03:27 2010 +0000

    Fix rounding in clocks_calc_mult_shift()
    
    Russell King reports:
    | On the ARM dev boards, we have a 32-bit counter running at 24MHz.  Calling
    | clocks_calc_mult_shift(&mult, &shift, 24MHz, NSEC_PER_SEC, 60) gives
    | us a multiplier of 2796202666 and a shift of 26.
    |
    | Over a large counter delta, this produces an error - lets take a count
    | from 362976315 to 4280663372:
    |
    | (4280663372-362976315) * 2796202666 / 2^26 - (4280663372-362976315) * 
(1000/24)
    |  => -38.91872422891230269990
    |
    | Can we do better?
    |
    | (4280663372-362976315) * 2796202667 / 2^26 - (4280663372-362976315) * 
(1000/24)
    | 19.45936211449532822051
    |
    | which is about twice as good as the 2796202666 multiplier.
    |
    | Looking at the equivalent divisions obtained, 2796202666 / 2^26 gives
    | 41.66666665673255920410ns per tick, whereas 2796202667 / 2^26 gives
    | 41.66666667163372039794ns.  The actual value wanted is 1000/24 =
    | 41.66666666666666666666ns.
    
    Fix this by ensuring we round to nearest when calculating the
    multiplier.
    
    Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
    Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
    Tested-by: Olof Johansson <olof@xxxxxxxxx>
    Tested-by: Jamie Iles <jamie@xxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5e06b6492e53ab2a4e467763a9ee9f70b032c301
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Wed Dec 15 19:19:25 2010 +0000

    ARM: ensure all sched_clock() implementations are notrace marked
    
    ftrace requires sched_clock() to be notrace.  Ensure that all
    implementations are so marked.  Also make sure that they include
    linux/sched.h
    
    Also ensure OMAP clocksource read functions are marked notrace as
    they're used for sched_clock() too.
    
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
    Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
    Tested-by: Olof Johansson <olof@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 684e94cbcb5add60356d124166e40feb2174f0f1
Author: Colin Cross <ccross@xxxxxxxxxxx>
Date:   Wed Nov 17 16:20:15 2010 -0800

    ARM: tegra: timer: Separate clocksource and sched_clock
    
    tegra_clocksource_read should not use cnt32_to_63, wrapping is
    already handled in the clocksource code.  Move the cnt32_to_63
    into the sched_clock function, and replace the use of clocksource
    mult and shift with a multiplication by 1000 to convert us to ns.
    
    Acked-by: John Stultz <johnstul@xxxxxxxxxx>
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Tested-by: Olof Johansson <olof@xxxxxxxxx>
    Signed-off-by: Colin Cross <ccross@xxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 11e718a6535c0c7a375b24c3ad60a98b988090c8
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:21:52 2010 +0000

    ARM: realview/versatile: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Tested-by: Will Deacon <will.deacon@xxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 2218543fe0c40ce36fa165c5003072cc8b236c34
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:21:41 2010 +0000

    ARM: stmp: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:21:33 2010 +0000

    ARM: orion: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Nicolas Pitre <nico@xxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit e0387320c32d4b9852e6436233274003e82318a6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:21:21 2010 +0000

    ARM: spear: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Viresh Kumar <viresh.kumar@xxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 8492fd28987732e42f33a3711299927e8905d448
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:20:49 2010 +0000

    ARM: nomadik: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:20:35 2010 +0000

    ARM: mxc: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit d28b116b9239b603f790a5ed6f0c5fe329561b49
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:20:23 2010 +0000

    ARM: iop: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 894cf56b1a64b65360086c2c890c2ae7f257793f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:20:06 2010 +0000

    ARM: nuc: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Wan zongshun <mcuos.com@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit da797478c1ba05a858c7719a02ce0856a5bb69ce
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:19:55 2010 +0000

    ARM: U300: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 6b46340a18e7552656097119d121b4b42049dde1
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:19:44 2010 +0000

    ARM: tcc8k: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 2c760b5b52a56e8b92c384dc9611e23fd4980d03
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:19:35 2010 +0000

    ARM: SA11x0: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 71c874529904818a2888a650425369e0842ff28d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:19:22 2010 +0000

    ARM: s5pv310: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit f62ae0ce4369effc432ea25df09c88d7aa08965e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:19:11 2010 +0000

    ARM: PXA: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Tested-by: Eric Miao <eric.y.miao@xxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 8437c25e78c3af2b31bf6c8942494e34e267f446
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:18:44 2010 +0000

    ARM: omap: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit b460ddbbe29a45cc13e3f13314ec9aed7e9412f2
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:18:32 2010 +0000

    ARM: ns9xxx: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:18:21 2010 +0000

    ARM: netx: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit ff9c9772480f06bc7164217b93ebb99fc088539f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:18:12 2010 +0000

    ARM: MSM: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Tested-By: Jeff Ohlstein <johlstei@xxxxxxxxxxxxxx>
    Acked-by: David Brown <davidb@xxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 5975f496e07e0f1e396939308b815f99907440ea
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:18:04 2010 +0000

    ARM: mmp: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 594cbf2f4ceaaacc706eb1302ff139a61092ec6f
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:17:52 2010 +0000

    ARM: lpc32xx: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit b7c7c50adcf0d9c901542c5db8d795fe226bb454
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:17:40 2010 +0000

    ARM: ixp4xx: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Tested-by: Mikael Pettersson <mikpe@xxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 08963dab7c6b0ba6a687cb008299eabbbeff7282
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:17:24 2010 +0000

    ARM: integrator: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 7c044be50d4bdc33e039a65956b8a927feecaaa3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:17:12 2010 +0000

    ARM: davinci: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Tested-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 6eda51192fb1c767f792e92c67b9a4fd73c1fcba
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Mon Dec 13 13:16:39 2010 +0000

    ARM: bcmring: update clock source registration
    
    In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
    interfaces were added which simplify (and optimize) the selection of the
    divisor shift/mult constants.  Switch over to using this new interface.
    
    Acked-By: Scott Branden <sbranden@xxxxxxxxxxxx>
    Acked-By: Jiandong Zheng <jdzheng@xxxxxxxxxxxx>
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee
Author: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
Date:   Wed Dec 22 17:37:13 2010 +0100

    perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
    
    This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850.
    
    Cc: H. Peter Anvin <hpa@xxxxxxxxx>
    Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    LKML-Reference: <m3y67hsr0m.fsf@xxxxxxxxx>
    Signed-off-by: Franck Bui-Huu <fbuihuu@xxxxxxxxx>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit d3678758048308049cdad31ec3eae063be17c0db
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Tue Dec 21 23:38:37 2010 -0200

    perf test: Look forward for symbol aliases
    
    Not just before, fixing these false positives:
    
    [acme@mica linux]$ perf test -v 1
     1: vmlinux symtab matches kallsyms:
    --- start ---
    Looking at the vmlinux_path (6 entries long)
    Using //lib/modules/2.6.37-rc5-00180-ge06b6bf/build/vmlinux for symbols
    0xffffffff81058dc0: diff name v: sys_vm86old k: sys_ni_syscall
    0xffffffff81058dc0: diff name v: sys_vm86 k: sys_ni_syscall
    0xffffffff81058dc0: diff name v: sys_subpage_prot k: sys_ni_syscall
    0xffffffff810b5f7c: diff name v: probe_kernel_write k: __probe_kernel_write
    0xffffffff810b5fe5: diff name v: probe_kernel_read k: __probe_kernel_read
    0xffffffff811bc380: diff name v: __memset k: memset
    0xffffffff81384a98: diff name v: __sched_text_start k: sleep_on_common
    0xffffffff81386750: diff name v: __sched_text_end k: _raw_spin_trylock
    0xffffffff8138cee8: diff name v: __irqentry_text_start k: do_IRQ
    0xffffffff8138f079: diff name v: __start_notes k: _etext
    0xffffffff8138f079: diff name v: __stop_notes k: _etext
    ---- end ----
    vmlinux symtab matches kallsyms: FAILED!
    
    [acme@mica linux]$
    
    Some are weak functions, others are just markers, etc. They get in the rb 
tree
    with the same addr, so we need to look around to find the symbol with the 
same
    name.
    
    We were looking just at the previous entries with the same addr, look 
forward
    too.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Han Pingtian <phan@xxxxxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit b35cecf978e33bf8f4be0f36ffe00fe10f381c4a
Author: Thara Gopinath <thara@xxxxxx>
Date:   Wed Aug 18 12:23:12 2010 +0530

    OMAP4: Smartreflex framework extensions
    
    This patch extends the smartreflex framework to support
    OMAP4. The changes are minor like compiling smartreflex Kconfig
    option for OMAP4 also, and a couple of OMAP4 checks in
    the smartreflex framework.
    
    The change in sr_device.c where new logic has to be introduced
    for reading the efuse registers is due to the fact that in OMAP4
    the efuse registers are 24 bit aligned. A __raw_readl will
    fail for non-32 bit aligned address and hence the 8-bit read
    and shift.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit fb200cfb2330b959eabc94e2f2c15717ce8466af
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Wed Aug 18 12:22:52 2010 +0530

    OMAP4: hwmod: Add inital data for smartreflex modules.
    
    This patch adds the hwmod details for OMAP4 smartreflex modules.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 1376ee1d191b32d0be6d2956f1a6f3dd63251e2e
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:25 2010 +0530

    OMAP4: PM: Program correct init voltages for scalable VDDs
    
    By default the system boots up at nominal voltage for every
    voltage domain in the system. This patch puts vdd_mpu, vdd_iva
    and vdd_core to the correct boot up voltage as per the opp tables
    specified. This patch implements this by matching the rate of
    the main clock of the voltage domain with the opp table and
    picking up the correct voltage.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit bd38107b565a41d994aa22db0962ffcc34ebef02
Author: Thara Gopinath <thara@xxxxxx>
Date:   Fri Dec 10 23:15:23 2010 +0530

    OMAP4: Adding voltage driver support
    
    OMAP4 has three scalable voltage domains vdd_mpu, vdd_iva
    and vdd_core. This patch adds the voltage tables and other
    configurable voltage processor and voltage controller
    settings to control these three scalable domains in OMAP4.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 3b01a413c196c91040d41c86e5b56f76bb369f74
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Date:   Wed Dec 22 01:08:36 2010 -0200

    perf symbols: Improve kallsyms symbol end addr calculation
    
    For kallsyms we don't have the symbol address end, so we do an extra pass 
and
    set the symbol end addr as being the start of the next minus one.
    
    But this was being done just after we filtered the symbols of a
    particular type (functions, variables), so the symbol end was sometimes
    after what it really is.
    
    Fixing up symbol end also was falling apart when we have symbol aliases,
    then the end address of all but the last alias was being set to be
    before its start.
    
    Fix it up by checking for symbol aliases and making the kallsyms__parse
    routine use the next symbol, whatever its type, as the limit for the
    previous symbol, passing that end address to the callback.
    
    This was detected by the 'perf test' synthetic paranoid regression
    tests, fix it up so that even that case doesn't mislead us.
    
    Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
    Cc: Mike Galbraith <efault@xxxxxx>
    Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
    Cc: Paul Mackerras <paulus@xxxxxxxxx>
    Cc: Stephane Eranian <eranian@xxxxxxxxxx>
    LKML-Reference: <new-submission>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>

commit 7bc3ed9ae632b9c94d3721d555d3452e24ca8ee3
Author: Thara Gopinath <thara@xxxxxx>
Date:   Fri Dec 10 23:15:16 2010 +0530

    OMAP4: Register voltage PMIC parameters with the voltage layer
    
    TWL6030 is the power IC used along with OMAP4 in OMAP4 SDPs,
    blaze boards and panda boards. This patch registers the OMAP4
    PMIC specific information with the voltage layer.
    This also involves implementing a different formula for
    voltage to vsel and vsel to voltage calculations from
    TWL4030.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 1482d8be5525eccdec6286677d40af29da03a30c
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:25 2010 +0530

    OMAP3: PM: Program correct init voltages for VDD1 and VDD2
    
    By default the system boots up at nominal voltage for every
    voltage domain in the system. This patch puts VDD1 and VDD2
    to the correct boot up voltage as per the opp tables specified.
    This patch implements this by matching the rate of the main clock
    of the voltage domain with the opp table and picking up the correct
    voltage.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 077fceca3a5db69791d64723ffba1caad2f03a08
Author: Thara Gopinath <thara@xxxxxx>
Date:   Wed Oct 27 20:29:37 2010 +0530

    OMAP3: PM: Adding debug support to Voltage and Smartreflex drivers
    
    This patch adds debug support to the voltage and smartreflex drivers.
    This means a whole bunch of voltage processor and smartreflex
    parameters are now visible through the pm debugfs.
    The voltage parameters can be viewed at
            /debug/voltage/vdd_<x>/<parameter>
    and the smartreflex parameters can be viewed at
            /debug/voltage/vdd_<x>/smartreflex/<parameter>
    
    Also smartreflex n-target values are now exposed out at
        /debug/voltage/vdd_<x>/smartreflex/nvalue/<voltage>
    
    This is a read-write interface which means user has the
    flexibility to change the n-target values for any opp.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit fbc319f67660ede23cc22f3af5df559693f8062e
Author: Thara Gopinath <thara@xxxxxx>
Date:   Fri Dec 10 22:51:05 2010 +0530

    OMAP3: PM: Register TWL4030 pmic info with the voltage driver.
    
    This patch registers the TWL4030 PMIC specific informtion
    with the voltage driver. Failing this patch the voltage driver
    is unware of the formula to use for vsel to voltage and vice versa
    conversion and lot of other PMIC dependent parameters.
    
    This file is based on the arch/arm/plat-omap opp_twl_tpl.c file
    by Paul Walmsley. The original file is replaced by this file.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit fa765823a3cbb9ce1b13ce2832109a50d899c471
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:25 2010 +0530

    OMAP3: PM: Adding smartreflex class3 driver
    
    Smartreflex Class3 implementation continuously monitors
    silicon performance  and instructs the Voltage Processors
    to increase or decrease the voltage.
    This patch adds smartreflex class 3 driver. This driver hooks
    up with the generic smartreflex driver smartreflex.c to abstract
    out class specific implementations out of the generic driver.
    
    Class3 driver is chosen as the default class driver for smartreflex.
    If any other class driver needs to be implemented, the init of that
    driver should be called from the board file. That way the new class driver
    will over-ride the Class3 driver.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit d34427267186827dfd62bd8cf726601fffb22534
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:24 2010 +0530

    OMAP3: PM: Adding smartreflex hwmod data
    
    This patch adds the smartreflex hwmod data for OMAP3430
    and OMAP3630.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 0c0a5d61ed9319e7e666990a7888f3b00868ac20
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:23 2010 +0530

    OMAP3: PM: Adding smartreflex device file.
    
    This patch adds support for device registration of various
    smartreflex module present in the system. This patch introduces
    the platform data for smartreflex devices which include
    the efused n-target vaules, a parameter to indicate
    whether smartreflex autocompensation needs to be
    enabled on init or not. An API
    omap_enable_smartreflex_on_init is provided for the
    board files to enable smartreflex autocompensation during
    system boot up.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 984aa6dbf4ca5be806fee217311c9cc68e8f2e88
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:22 2010 +0530

    OMAP3: PM: Adding smartreflex driver support.
    
    SmartReflex modules do adaptive voltage control for real-time
    voltage adjustments. With Smartreflex the power supply voltage
    can be adapted to the silicon performance(manufacturing process,
    temperature induced performance, age induced performance etc).
    
    There are differnet classes of smartreflex implementation.
        Class-0: Manufacturing Test Calibration
        Class-1: Boot-Time Software Calibration
        Class-2: Continuous Software Calibration
        Class-3: Continuous Hardware Calibration
        Class-4: Fully Integrated Power Management
    
    OMAP3 has two smartreflex modules one associated with VDD MPU and the
    other associated with VDD CORE.
    This patch adds support for  smartreflex driver. The driver is designed
    for Class-1 , Class-2 and Class-3 support and is  a platform driver.
    Smartreflex driver can be enabled through a Kconfig option
    "SmartReflex support" under "System type"->"TI OMAP implementations" menu.
    
    Smartreflex autocompensation feature can be enabled runtime through
    a debug fs option.
    To enable smartreflex autocompensation feature
        echo 1 > /debug/voltage/vdd_<X>/smartreflex/autocomp
    To disable smartreflex autocompensation feature
        echo 0 > /debug/voltage/vdd_<X>/smartreflex/autocomp
    
    where X can be mpu, core , iva etc.
    
    This patch contains code originally in linux omap pm branch.
    Major contributors to this driver are
    Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley,
    Nishant Menon, Kevin Hilman.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 3b92408c7dfeb918fdd2f9fadc73177a59ad621c
Author: Thara Gopinath <thara@xxxxxx>
Date:   Wed Aug 18 16:21:58 2010 +0530

    OMAP: Introduce voltage domain information in the hwmod structures
    
    This patch extends the device hwmod structure to contain
    info about the voltage domain to which the device belongs to.
    This is needed to support a device based DVFS where the
    device knows which voltage domain it belongs to.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 2f34ce81b8c05c900e45bd88595cc154f7bb5957
Author: Thara Gopinath <thara@xxxxxx>
Date:   Sat May 29 22:02:21 2010 +0530

    OMAP3: PM: Adding voltage driver support.
    
    This patch adds voltage driver support for OMAP3. The driver
    allows  configuring the voltage controller and voltage
    processors during init and exports APIs to enable/disable
    voltage processors, scale voltage and reset voltage.
    The driver maintains the global voltage table on a per
    VDD basis which contains the various voltages supported by the
    VDD along with per voltage dependent data like smartreflex
    efuse offset, errminlimit and voltage processor errorgain.
    The driver also allows the voltage parameters dependent on the
    PMIC to be passed from the PMIC file through an API.
    The driver allows scaling of VDD voltages either through
    "vc bypass method" or through "vp forceupdate method" the
    choice being configurable through the board file.
    
    This patch contains code originally in linux omap pm branch
    smartreflex driver.  Major contributors to this driver are
    Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley,
    Nishant Menon, Kevin Hilman. The separation of PMIC parameters
    into a separate structure which can be populated from
    the PMIC file is based on the work of Lun Chang from Motorola
    in an internal tree.
    
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    [khilman: fixed link error for OMAP2-only defconfig]
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit a3ba81131aca243bfecfa78c42edec0cd69f72d6
Author: Ben Gamari <bgamari.foss@xxxxxxxxx>
Date:   Wed Dec 22 13:30:14 2010 -0500

    Make fixdep error handling more explicit
    
    Also add missing error handling to fstat call
    
    Signed-off-by: Ben Gamari <bgamari.foss@xxxxxxxxx>
    Signed-off-by: Michal Marek <mmarek@xxxxxxx>

commit 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f
Author: Don Zickus <dzickus@xxxxxxxxxx>
Date:   Wed Dec 22 14:00:03 2010 -0500

    x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on 
CONFIG_HARDLOCKUP_DETECTOR
    
    The x86 arch has shifted its use of the nmi_watchdog from a
    local implementation to the global one provide by
    kernel/watchdog.c.  This shift has caused a whole bunch of
    compile problems under different config options.  I attempt to
    simplify things with the patch below.
    
    In order to simplify things, I had to come to terms with the
    meaning of two terms ARCH_HAS_NMI_WATCHDOG and
    CONFIG_HARDLOCKUP_DETECTOR.  Basically they mean the same thing,
    the former on a local level and the latter on a global level.
    
    With the old x86 nmi watchdog gone, there is no need to rely on
    defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't
    make sense any more.  x86 will now use the global
    implementation.
    
    The changes below do a few things.  First it changes the few
    places that relied on ARCH_HAS_NMI_WATCHDOG to use
    CONFIG_X86_LOCAL_APIC (the former was an alias for the latter
    anyway, so nothing unusual here).  Those pieces of code were
    relying more on local apic functionality the nmi watchdog
    functionality, so the change should make sense.
    
    Second, I removed the x86 implementation of
    touch_nmi_watchdog().  It isn't need now, instead x86 will rely
    on kernel/watchdog.c's implementation.
    
    Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from
    x86.  And tweaked the include/linux/nmi.h file to tell users to
    look for an externally defined touch_nmi_watchdog in the case of
    ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This
    changes removes some of the ugliness in that file.
    
    Finally, I added a Kconfig dependency for
    CONFIG_HARDLOCKUP_DETECTOR that said you can't have
    ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR.  You can
    only have one nmi_watchdog.
    
    Tested with
    ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken
    configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig,
    (various broken configs)
    
    Hopefully, after this patch I won't get any more compile broken
    emails. :-)
    
    v3:
      changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct 
function
      prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set.
    
    Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: fweisbec@xxxxxxxxx
    LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@xxxxxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a
Author: Chaoming Li <chaoming_li@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 10:56:02 2010 -0600

    rtlwifi: Fix large packet issue
    
    An RX buffer is set to 9100 bytes to receive 8K AMSDU; however, an skb
    of this size fails in the kernel.
    
    Signed-off-by: Chaoming Li <chaoming_li@xxxxxxxxxxxxxx>
    Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 172128468f61e16e1427238278b9ad775584aa89
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Wed Dec 22 10:15:30 2010 +0100

    mac80211: cleanup select_queue
    
    There's a redundant rcu_read_lock/unlock pair, a
    redundant variable, and a few redundant accesses
    to the 1d_to_ac array. Fix this to make the code
    neater and easier to follow.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit db7ec38d8e99f449856c11ffaef363a8eb5af90f
Author: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
Date:   Wed Dec 22 12:20:12 2010 +0530

    ath9k: Reset keycache on resume
    
    It looks like some hardware registers are left into undefined state
    after suspend/resume. At minimum, this can cause odd issues related to
    key cache and hardware trying to encrypt/decrypt frames unexpectedly.
    This seems to happen even when there is no keys configured, i.e., hardware
    can end up touching TX frames just based of invalid key cache context
    even if the driver is not asking a specific entry to be used. In
    addition, RX can likely be affected. This patch fixes this issue.
    
    Signed-off-by: Jouni Malinen <Jouni.Malinen@xxxxxxxxxxx>
    Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit e6d8a817d00793eecd063b1548bbc954ab62b124
Author: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date:   Tue Dec 21 19:40:40 2010 -0600

    rtlwifi: rtl8192ce: Fix driver problem when radio switch off at module load
    
    If the radio enable switch is off when the driver is loaded, it is not
    possible to get radio output until the driver is unloaded and reloaded
    with the switch on.
    
    Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 40d70dd12200ffeacfe9caaa8242e3ad2995bb5d
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:49 2010 +0200

    rndis_wlan: add support for set_power_mgmt
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 49b35bd3f5bbc6997b24b04e9d4896f00cee3528
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:42 2010 +0200

    rndis_wlan: add support for set_cqm_rssi_config
    
    Device poller already reads current RSSI, so add support for
    set_cqm_rssi_config there.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit a3463a1fdc9aa0881760e54efbd62742275601a5
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:34 2010 +0200

    rndis_wlan: remove unused variable from priv structure
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit c2aa413279cde7c867fc90b07f83fff3c1e9e98d
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:27 2010 +0200

    rndis_wlan: constify rndis_config_ops
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 21b27beca73ad7d2829fe9cc3e48054f69e3d9d3
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:20 2010 +0200

    rndis_wlan: turn radio off before interface is bring up
    
    Radio should be off when interface is down.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 0b578021745b61b2ff89f6bacbac5db08a9a8089
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:12 2010 +0200

    rndis_wlan: do not set default_key if not WEP key
    
    rndis_set_default_key did call add_wep_key to set default key on device, 
even
    if key is WPA. This caused rndis_wlan not work with wpa_supplicant in 
nl80211
    mode (causing disconnect from AP).
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit bfe3850b0cfca6ba64395e2705d9a51cd044f374
Author: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
Date:   Tue Dec 21 22:44:05 2010 +0200

    rndis_wlan: scanning, workaround device returning incorrect bssid-list item 
count.
    
    Sometimes device returns wrong number of items in bssid-list. Appears that
    some specific beacons trigger this problem and leads to very poor scanning
    results. Workaround by ignoring num_items received from device and 
walkthrough
    full bssid-list buffer.
    
    v2: Fix buffer range checks and reading next item length. Old code read
        behind buffer on last item but didn't use those values as 'count' would
        also reach zero. Also fix resizing of buffer if device has larger 
buffer,
        old code assumed that BSSID-list OID would return same buffer size
        when it really can return yet another new larger length.
    
    Tested-by: Luís Picciochi <Pitxyoki@xxxxxxxxx>
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna@xxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ab72efdf107e5b0e0a05efb8f24cc6c598ae31ea
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 21:29:44 2010 +0100

    b43: N-PHY: enable support for PHYs rev 3 and higher
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit d4814e69eec24f46a9f0a6d57b80e0a6add594c7
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 23:57:48 2010 +0100

    b43: N-PHY: update 2056 radio on channel switch on rev3+
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit d41446467320b7cbe550a85c44fd9d3cb12c119d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 19:40:18 2010 +0100

    b43: N-PHY: use correct channel tables for rev4+
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit aca434d36f38754392f53e7b16f90eab66ae95e0
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 11:50:22 2010 +0100

    b43: N-PHY: avoid PHY hangs for rev 3 and 4
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 94a5b0452410f8bdff27aa13592bec046fb6095d
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 11:50:21 2010 +0100

    b43: N-PHY: add init tables for 2056 radio
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit ea7ee14b8a6371f006d73333ef2b7fe929b6dab0
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 17:13:44 2010 +0100

    b43: N-PHY: implement radio 2056 init steps
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit e41596a118a5cb15a045ef773dc117b2596e6a86
Author: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
Date:   Tue Dec 21 11:50:19 2010 +0100

    b43: use correct firmware for newer cores
    
    Signed-off-by: RafaÅ? MiÅ?ecki <zajec5@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit d0ce2d170585b7061a08af061d64ebb08c6782dd
Author: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
Date:   Tue Dec 21 01:42:43 2010 -0800

    ath9k_hw: Fix bug in eeprom data length validation for AR9485
    
    The size of the eeprom data is 1088 bytes for AR9485. But
    a sanity check is done against 4K which would result in a
    'potential read past the end of the buffer' smatch complaint.
    
    Reported-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 0207c0c51a37659a92232e665f2a7fadec170556
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Tue Dec 21 17:30:43 2010 +0900

    ath5k: Use helper function to get eeprom mode from channel
    
    Introduce a helper function to get the EEPROM mode from channel and remove
    multiple similar switch statements. Also since it's now easy to get the 
EEPROM
    mode from the channel, use them inside the functions which need it, instead 
of
    passing a redundant ee_mode parameter.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 26a51ad7f285236ca593c57cffcaadd40514084a
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Tue Dec 21 17:30:37 2010 +0900

    ath5k: Remove ATH5K_INI_RFGAIN defines, use band instead
    
    Remove redundant defines.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 51f00622e5664ae77fd6c8670ddd402d9b77ccc8
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Tue Dec 21 17:30:32 2010 +0900

    ath5k: Track current TX power separately from max TX power
    
    Add a new variable to keep track of the currently configured tx power. 
Before
    max_pwr was re-used for keeping the maximum allowed power as well as the
    current configuration. Doing a min() on it allows you to lower the txpower, 
but
    how would you be able to make it higher again?
    
    This patch fixes that by adding a new variable ah_cur_pwr which is used 
instead
    of txp_max_pwr to keep the current configuration. txp_max_pwr is used to 
check
    if we are within the limits.
    
    Another problem fixed by this patch is that it avoids setting a zero txpower
    when things are initialized first and the current power is not yet set.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 56bd29d361a53f3bf6b815b5bf570a23bdc55b35
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Tue Dec 21 17:30:26 2010 +0900

    ath5k: Separate powertable setup and writing
    
    And rename functions which write the powertable to make it clearer.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 26c7fc436422de5d6d2b491f777e965e96f5c3a2
Author: Bruno Randolf <br1@xxxxxxxxxxx>
Date:   Tue Dec 21 17:30:20 2010 +0900

    ath5k: Simplify powertable recalculation
    
    Let ath5k_hw_txpower() decide if it can re-use the powertable or if it has 
to
    be recalculated instead of passing a 'fast' flag from the outside.
    
    Signed-off-by: Bruno Randolf <br1@xxxxxxxxxxx>
    Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc
Author: Dan Carpenter <error27@xxxxxxxxx>
Date:   Tue Dec 21 06:59:06 2010 +0300

    ath9k: unlock on error path in ath9k_change_interface()
    
    There is a missing unlock when we hit the "No beacon slot available"
    error condition.
    
    Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 8d6a686a0d20d39c202fdfc6fa7f1daf1d6e3b35
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:56 2010 +0100

    rtlwifi: Use pci_pcie_cap()
    
    Use function pci_pcie_cap() instead of accessing struct member directly.
    
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Tested-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit e40b5faabc34f61fdf17b40d2e31837461ddc467
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:55 2010 +0100

    ath9k: Use pci_is_pcie()
    
    Use function pci_is_pcie() instead of accessing struct member directly.
    
    CC: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit e98b06b09be0fc459806aa4d2c301cfaf268c570
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:54 2010 +0100

    ath5k: Use pci_is_pcie()
    
    Use function pci_is_pcie() instead of accessing struct member directly.
    
    CC: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 2cdb9a42f3b4c97088ea0768dbee55ee8863f233
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:53 2010 +0100

    rt2x00: Use pci_is_pcie()
    
    Use function pci_is_pcie() instead of accessing struct member directly.
    
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx>
    Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 6b740aaa005474a7b135d3c554b9295c73eaab95
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:52 2010 +0100

    ssb: Use pci_is_pcie()
    
    Use function pci_is_pcie() instead of accessing struct member directly.
    
    CC: Michael Buesch <mb@xxxxxxxxx>
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 750de29109770f6b50daecc4c44aaa50a9e0075b
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:51 2010 +0100

    wl12xx: remove unnecessary import
    
    No function declared in gpio.h is used here.
    
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Acked-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 63d9faf665ba27c65f0cf118df05a412d3dfd39d
Author: Hauke Mehrtens <hauke@xxxxxxxxxx>
Date:   Tue Dec 21 02:01:50 2010 +0100

    wl1251: remove unnecessary import
    
    No function declared in gpio.h is used here.
    
    Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
    Acked-by: Kalle Valo <kvalo@xxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit afe68d0a8f5961652e26cea39d74e2cc820de841
Author: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Date:   Mon Dec 20 11:29:59 2010 -0500

    ath9k: fix aphy / wiphy idle mismatch
    
    ath9k supports its own set of virtual wiphys, and it uses
    the mac80211 idle notifications to know when a device needs
    to be idle or not. We recently changed ath9k to force idle
    on driver stop() and on resume but forgot to take into account
    ath9k's own virtual wiphy idle states. These are used internally
    by ath9k to check if the device's radio should be powered down
    on each idle call. Without this change its possible that the
    device could have been forced off but the virtual wiphy idle
    was left on.
    
    Cc: stable@xxxxxxxxxx
    Cc: Paul Stewart <pstew@xxxxxxxxxx>
    Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit d584747be838775cebbf5937c20b24da6899e3e8
Author: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
Date:   Mon Dec 20 14:39:51 2010 +0530

    ath9k: Fix warnings on card removal
    
    The recently added warning message on power change failure
    is not needed on device removal.
    
    ath: Failed to wakeup in 500us
    ------------[ cut here ]------------
    WARNING: at drivers/net/wireless/ath/ath9k/hw.c:1618
    ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]()
    Hardware name: 64756D6
    Pid: 540, comm: kworker/u:3 Not tainted 2.6.37-rc6-wl #37
    Call Trace:
     [<ffffffff810501aa>] warn_slowpath_common+0x7a/0xb0
     [<ffffffffa056e280>] ? ath9k_iowrite32+0x0/0x90 [ath9k]
     [<ffffffff810501f5>] warn_slowpath_null+0x15/0x20
     [<ffffffffa05226ef>] ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]
     [<ffffffffa05700e5>] ath9k_ps_wakeup+0x85/0xd0 [ath9k]
     [<ffffffffa0570685>] ath9k_configure_filter+0x25/0x80 [ath9k]
     [<ffffffffa04dde43>] ieee80211_configure_filter+0x133/0x190 [mac80211]
     [<ffffffffa04ee502>] ieee80211_do_stop+0x132/0x540 [mac80211]
     [<ffffffff813466ff>] ? _raw_spin_unlock_bh+0x1f/0x30
     [<ffffffff812b6923>] ? dev_deactivate+0x1c3/0x1e0
     [<ffffffffa04ee925>] ieee80211_stop+0x15/0x20 [mac80211]
     [<ffffffff8129d1b6>] __dev_close+0x56/0x90
    
    Signed-off-by: Rajkumar Manoharan <rmanoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 97dcec5715a381362c88d1542e52c63147764d3c
Author: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
Date:   Mon Dec 20 08:02:42 2010 +0530

    ath9k_htc: Fix warning on device removal
    
    The commit "ath9k_hw: warn if we cannot change the power to the chip"
    introduced a new warning to indicate chip powerup failures, but this
    is not required for devices that have been removed. Handle USB device
    removal properly by checking for unplugged status.
    
    For PCI devices, this warning will still be seen when the card is pulled
    out, not sure how to check for card removal.
    
    Signed-off-by: Sujith Manoharan <Sujith.Manoharan@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 2af10844eb6ed104f9505bf3a7ba3ceb02264f31
Merge: 73bc7d315f56e260071bdb5f15e25b53bddc1402 
90a8a73c06cc32b609a880d48449d7083327e11a
Author: Greg Kroah-Hartman <gregkh@xxxxxxx>
Date:   Wed Dec 22 12:25:34 2010 -0800

    USB: Merge 2.6.37-rc5 into usb-next
    
    This is to resolve the conflict in the file,
    drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
    needed for the 2.6.37 release.
    
    Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

commit 28bd2c341120db346f30b3ba11b4eac06b2cc981
Author: Sekhar Nori <nsekhar@xxxxxx>
Date:   Mon Dec 20 21:31:34 2010 +0530

    davinci: am18x/da850/omap-l138 evm: add support for higher speed grades
    
    Apart from the regular AM18x/DA850/OMAP-L138 SoC operating
    at 300MHz, these SoCs have variants that can operate at a
    maximum of 456MHz. Variants at 408Mhz and 375 Mhz are available
    as well.
    
    Not all silicon is qualified to run at higher speeds and
    unfortunately the maximum speed the chip can support can only
    be determined from the label on the package (not software
    readable).
    
    The EVM hardware for all these variants is the same (except
    for the actual SoC populated).
    
    U-Boot on the EVM sets up ATAG_REVISION to inform the OS
    regarding the speed grade supported by the silicon. We use
    this information to pass on the speed grade information to
    the SoC code.
    
    Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 39e145500458bd68d1d33adfa256886900b1597b
Author: Sekhar Nori <nsekhar@xxxxxx>
Date:   Mon Dec 20 21:31:33 2010 +0530

    davinci: am18x/da850/omap-l138: add support for higher speed grades
    
    AM18x/DA850/OMAP-L138 SoCs have variants that can operate
    at a maximum of 456 MHz at 1.3V operating point. Also the
    1.2V operating point has a variant that can support a maximum
    of 375 MHz.
    
    This patch adds three new OPPs (456 MHz, 408 MHz and 372 MHz)
    to the list of DA850 OPPs.
    
    Not all silicon is qualified to run at higher speeds and
    unfortunately the maximum speed the chip can support can only
    be determined from the label on the package (not software
    readable).
    
    Because of this, we depend on the maximum speed grade information
    to be provided to us in some board specific way. The board informs
    the maximum speed grade information by setting the da850_max_speed
    variable.
    
    Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 9cc3049911d0166d54247cf2471802eb5293c66c
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date:   Thu Dec 9 16:51:07 2010 -0500

    da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional
    
    Use the mach-davinci/Kconfig to enable gpio-keys-polled as default when
    da850-evm machine is enabled.
    
    Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
    CC: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    CC: "Nori, Sekhar" <nsekhar@xxxxxx>
    CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 70b3093963feefbf122672f9fe5f916db5338ca0
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date:   Thu Dec 9 16:51:06 2010 -0500

    da850-evm: add baseboard GPIO expander buttons, switches and LEDs
    
    This patch adds a pca953x platform device for the tca6416 found on the evm
    baseboard. The tca6416 is a GPIO expander, also found on the UI board at a
    separate I2C address. The pins of the baseboard IO expander are connected to
    software reset, deep sleep enable, test points, a push button, DIP switches 
and
    LEDs.
    
    Add support for the push button, DIP switches and LEDs and test points (as
    free GPIOs). The reset and deep sleep enable connections are reserved by the
    setup routine so that userspace can't toggle those lines.
    
    The existing tca6416-keypad driver was not employed because there was no
    apararent way to register the LEDs connected to gpio's on the tca6416 while
    simultaneously registering the tca6416-keypad instance.
    
    Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
    Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
    CC: Govindarajan, Sriramakrishnan <srk@xxxxxx>
    Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
    Reviewed-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
    CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 53c2897d36153830d4d34324bedf23a641602cc9
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date:   Thu Dec 9 16:51:05 2010 -0500

    da850-evm: extract defines for SEL{A,B,C} pins in UI expander
    
    The setup and teardown methods of the UI expander reference the SEL_{A,B,C}
    pins by 'magic number' in each function. This uses the common enum for 
their offsets
    in the expander setup and teardown functions.
    
    Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
    Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
    Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
    Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
    CC: Victor Rodriguez <vm.rod25@xxxxxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 75929f5e2bcba7cc328fcf9a3d7ba7076946ac3a
Author: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
Date:   Thu Dec 9 16:51:04 2010 -0500

    da850-evm: add UI Expander pushbuttons
    
    This patch adds EV_KEYs for each of the 8 pushbuttons on the UI board via a
    gpio-key device.
    
    The expander is a tca6416; it controls the SEL_{A,B,C} lines which enable 
and
    disable the peripherals found on the UI board in addition to the 8 
pushbuttons
    mentioned above. The reason the existing tca6416-keypad driver is not 
employed
    is because there was no aparent way to keep the gpio lines used as
    SEL_{A,B,C} registered while simultaneously registering the pushbuttons as a
    tca6416-keypad instance.
    
    Some experimentation with the polling interval was performed; we were 
searching
    for the largest polling interval that did not affect the feel of the
    responsiveness of the buttons. It is very subjective but 200ms seems to be a
    good value that accepts firm pushes but rejects very light ones. The key 
values
    assigned to the buttons were arbitrarily chosen to be F1-F8.
    
    Signed-off-by: Ben Gardiner <bengardiner@xxxxxxxxxxxxxx>
    Reviewed-by: Chris Cordahi <christophercordahi@xxxxxxxxxxxxxx>
    CC: Govindarajan, Sriramakrishnan <srk@xxxxxx>
    Reviewed-by: Sekhar Nori <nsekhar@xxxxxx>
    Signed-off-by: Sekhar Nori <nsekhar@xxxxxx>
    CC: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    CC: Gabor Juhos <juhosg@xxxxxxxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit ee09b3c1cff0335137dc1b146488e4352f640f13
Author: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Date:   Wed Dec 22 11:39:59 2010 -0800

    sfq: fix sfq class stats handling
    
    sfq_walk() runs without qdisc lock. By the time it selects a non empty
    hash slot and sfq_dump_class_stats() is run (with lock held), slot might
    have been freed : We then access q->slots[SFQ_EMPTY_SLOT], out of
    bounds, and crash in slot_queue_walk()
    
    On previous kernels, bug is here but out of bounds qs[SFQ_DEPTH] and
    allot[SFQ_DEPTH] are located in struct sfq_sched_data, so no illegal
    memory access happens, only possibly wrong data reported to user.
    
    Also, slot_dequeue_tail() should make sure slot skb chain is correctly
    terminated, or sfq_dump_class_stats() can access freed skbs.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 65a6538a56d4c7ae8465f2a8420ddc65877b6779
Author: Luciano Coelho <luciano.coelho@xxxxxxxxx>
Date:   Tue Dec 21 16:02:17 2010 +0200

    mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration
    
    If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
    because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
    set.
    
    This patch adds ifdefs around the tpt_led_trigger declaration in
    ieee80211_i.h to avoid the problem.
    
    Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
    Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 67408c8c7b9daf28b50e33be3541334c07d15789
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Tue Nov 30 08:59:23 2010 +0100

    mac80211: selective throughput LED trigger active
    
    The throughput LED trigger was always active when
    the radio was enabled. In most cases that's likely
    the desired behaviour, but iwlwifi requires it to
    be only active when one of the virtual interfaces
    is actually "connected" in some way.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit e1e5406854378dfada3f33c7192b012083a5b8e0
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Tue Nov 30 08:58:45 2010 +0100

    mac80211: add throughput based LED blink trigger
    
    iwlwifi and other drivers like to blink their LED
    based on throughput. Implement this generically in
    mac80211, based on a throughput table the driver
    specifies. That way, drivers can set the blink
    frequencies depending on their desired behaviour
    and max throughput.
    
    All the drivers need to do is provide an LED class
    device, best with blink hardware offload.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit fe67c913f1ec2a01aaa9176c80ef36eaf87d705d
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Sat Nov 27 20:02:59 2010 +0100

    mac80211: make LED trigger names available early
    
    The throughput trigger will require doing LED
    classdev/trigger handling before register_hw(),
    so drivers should have access to the trigger
    names before it. If trigger registration fails,
    this will still make the trigger name available,
    but that's not a big problem since the default
    trigger will the simply not be found.
    
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 808601b75804475c9022f6375e76b7c62c99a10a
Merge: c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 
f17f9726c27c3921e00a5750e85070e6dd7e1ff7
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 11:32:24 2010 -0800

    Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 
into omap-for-linus

commit c10abbb26513f4ccff89c4d80912cb4d36fcd3e8
Merge: 4931445b94f49672028b81ace9d4eee8ddf19ab2 
da1f026b532ce944d74461497dc6d8c16456466e
Author: Tony Lindgren <tony@xxxxxxxxxxx>
Date:   Wed Dec 22 11:30:12 2010 -0800

    Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus

commit 63e35cd9bd4c8ae085c8b9a70554595b529c4100
Merge: 503b1a529a6b62b31904bab4699752c523cf76b2 
3d986b25b5faa50ba6afd94f60f270b6c3061e5e
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Wed Dec 22 14:27:21 2010 -0500

    Merge branch 'master' of 
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into 
for-davem
    
    Conflicts:
        drivers/net/wireless/iwlwifi/iwl-1000.c
        drivers/net/wireless/iwlwifi/iwl-6000.c
        drivers/net/wireless/iwlwifi/iwl-core.h

commit da1f026b532ce944d74461497dc6d8c16456466e
Author: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Date:   Mon Dec 20 21:09:22 2010 +0000

    Keyboard: omap-keypad: use matrix_keypad.h
    
    Most keypad drivers make use of the <linux/input/matrix_keypad.h>
    defined macros, structures and inline functions.
    
    Convert omap-keypad driver to use those as well, as suggested by a
    compile time warning, hardcoded into the OMAP <palt/keypad.h>.
    
    Created against linux-2.6.37-rc5.
    Tested on Amstrad Delta.
    Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to
    board-h4.
    
    Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
    Reviewed-by: Aaro Koskinen <aaro.koskinen@xxxxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 4e012e5f246d4da924b14d453452fd0838d4e03b
Author: Arno Steffen <arno.steffen@xxxxxxxxxxxxxx>
Date:   Wed Dec 22 18:14:36 2010 +0000

    OMAP3: fix typo in OMAP3_IVA_MASK
    
    OMAP3_IVA_MASK should use OMAP3_IVA_SHIFT instead of OMAP3_SGX_SHIFT
    
    Signed-off-by: Arno Steffen <arno.steffen@xxxxxxxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 6d38c4b4f1df70f953633c27ebcdc2712e9039bc
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date:   Tue Dec 21 17:46:01 2010 +0000

    omap: rx51: Remove tvout code that plays with gpio 40
    
    Commit 60d24ee "Added video data to support tvout on rx51" added code that
    tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong
    since this gpio has nothing to do with OMAP DSS but it is used to control
    one switch that selects is the audio jack connected to tvout or audio
    circuitry.
    
    This switch is already supported by the RX51 ASoC driver so there is no need
    to control it elsewhere. Switch is contolled with ALSA control
    'Jack Function' and tvout can be selected with following example:
    
        amixer -D hw:0 set 'Jack Function' 'TV-OUT'
    
    Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
    Cc: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
    Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 31bbb4f035c13a73d1ebc2626663971723cbd28f
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date:   Tue Dec 21 17:25:35 2010 +0000

    omap: rx51: Add vdda_dac supply for tvout
    
    Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS
    on RX51/N900 since it added DSS VENC support but a patch adding needed
    supply is missing from tree and no framebuffers are initialized.
    
    This patch is basically cleaned up version of original one:
    http://marc.info/?l=linux-omap&m=129070041402418&w=2
    
    Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
    Cc: Srikar <ext-srikar.1.bhavanarayana@xxxxxxxxx>
    Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit b5b9945b2b139ca922b49062053f34486ca64cca
Author: Jarkko Nikula <jhnikula@xxxxxxxxx>
Date:   Tue Dec 21 17:25:34 2010 +0000

    omap: rx51: Cleanup vdds_sdi supply construction
    
    It is much more cleaner to use REGULATOR_SUPPLY macro and a device name
    instead of having a reference to rx51_display_device.dev with #if defined()
    guards.
    
    Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
    Acked-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx>
    Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>

commit 3cfeb0c33f5cbcc6dde371392877ef3101b8f805
Author: John W. Linville <linville@xxxxxxxxxxxxx>
Date:   Mon Dec 20 15:16:53 2010 -0500

    rtl818x: move rtl8180 and rtl8187 to separate subdirectories
    
    These drivers share one header file, but nothing else.  Worse, both
    drivers use the rtl8225 part with different register settings.  The
    results has been some ugly naming -- let's simplify that.
    
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
    Acked-by: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
    Acked-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
    Acked-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>

commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
Date:   Wed Dec 22 10:15:07 2010 +0100

    mac80211: fix mesh forwarding
    
    Under memory pressure, the mac80211 mesh code
    may helpfully print a message that it failed
    to clone a mesh frame and then will proceed
    to crash trying to use it anyway. Fix that.
    
    Cc: stable@xxxxxxxxxx [2.6.27+]
    Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
    Acked-by: Javier Cardona <javier@xxxxxxxxxxx>
    Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>

commit 68229689b6dc950bea4b81dd60563884f4a7e1c5
Author: Oliver Neukum <oneukum@xxxxxxx>
Date:   Wed Dec 22 15:33:40 2010 +0100

    HID: usbhid: base runtime PM on modern API
    
    This patch doesn't alter functionality, but removes a dedicated kernel
    thread.
    
    Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
    Tested-by: Maulik Mankad <x0082077@xxxxxx>
    Signed-off-by: Jiri Kosina <jkosina@xxxxxxx>

commit f17f9726c27c3921e00a5750e85070e6dd7e1ff7
Author: Jon Hunter <jon-hunter@xxxxxx>
Date:   Thu Dec 9 23:13:40 2010 +0100

    OMAP4: clock data: Add missing fixed divisors
    
    The following OMAP4 clocks have the following fixed divisors that
    determine the frequency at which these clocks operate. These
    dividers are defined by the PRCM specification and without these
    dividers the rates of the below clocks are calculated incorrectly.
    This may cause internal peripherals using these clocks to operate
    at the wrong frequency.
    
    - abe_24m_fclk (freq = divided-by-8)
    - ddrphy_ck (freq = parent divided-by-2)
    - dll_clk_div_ck (freq = parent divided-by-2)
    - per_hs_clk_div_ck (freq = parent divided-by-2)
    - usb_hs_clk_div_ck (freq = parent divided-by-3)
    - func_12m_fclk (freq = parent divided-by-16)
    - func_24m_clk (freq = parent divided-by-4)
    - func_24mc_fclk (freq = parent divided-by-8)
    - func_48mc_fclk (freq = divided-by-4)
    - lp_clk_div_ck (freq = divided-by-16)
    - per_abe_24m_fclk (freq = divided-by-4)
    
    Signed-off-by: Jon Hunter <jon-hunter@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit 9bf8391846db849509a6aa6f1f0659843ca30662
Author: Vishwanath BS <vishwanath.bs@xxxxxx>
Date:   Tue Oct 5 19:35:34 2010 +0530

    OMAP3: SDRC: Add comments on Errata i520 for Global SW reset
    
    This patch adds comments on precaution to be taken if Global Warm reset is
    used as the means to trigger system reset.
    
    Signed-off-by: Vishwanath BS <vishwanath.bs@xxxxxx>
    [paul@xxxxxxxxx: fixed typos, one mentioned by Sanjeev]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Sanjeev Premi <premi@xxxxxx>

commit 9fb67204d7a00a6444bc121f221527034613d338
Merge: 8c1df4002aa425973d7d25ffa56c042acd953bed 
287050d390264402e11bea8b811859e42e8faa29
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Dec 22 12:46:12 2010 +0100

    Merge branch 'tip/perf/core' of 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into 
perf/core

commit bcbea798f8f1492052c23ceb4fbc2a96013a3865
Author: Tejun Heo <tj@xxxxxxxxxx>
Date:   Wed Dec 22 14:19:14 2010 +0100

    percpu: print out alloc information with KERN_DEBUG instead of KERN_INFO
    
    Now that percpu allocator is mostly stable, there is no reason to
    print alloc information with KERN_INFO and clutter the boot messages.
    Switch it to KERN_DEBUG.
    
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxx>
    Cc: Mike Travis <travis@xxxxxxx>

commit d8850ba425d9823d3184bd52f065899dac4689f9
Author: Jack Steiner <steiner@xxxxxxx>
Date:   Tue Nov 30 13:55:40 2010 -0600

    x86, UV: Fix the effect of extra bits in the hub nodeid register
    
    UV systems can be partitioned into multiple independent SSIs.
    Large partitioned systems may have extra bits in the node_id
    register. These bits are used when the total memory on all SSIs
    exceeds 16TB.  These extra bits need to be ignored when
    calculating x2apic_extra_bits.
    
    Signed-off-by: Jack Steiner <steiner@xxxxxxx>
    LKML-Reference: <20101130195926.972776133@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit e681041388e61ecd7f99dba66b3c1db11a564d92
Author: Jack Steiner <steiner@xxxxxxx>
Date:   Tue Nov 30 13:55:39 2010 -0600

    x86, UV: Add common uv_early_read_mmr() function for reading MMRs
    
    Early in boot, reading MMRs from the UV hub controller require
    calls to early_ioremap()/early_iounmap().  Rather than
    duplicating code, add a common function to do the
    map/read/unmap.
    
    Signed-off-by: Jack Steiner <steiner@xxxxxxx>
    LKML-Reference: <20101130195926.834804371@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 36bb94ba36f332de767cfaa3af6a5136435a3a9c
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Nov 16 08:40:36 2010 +0000

    ARM: pgtable: provide RDONLY page table bit rather than WRITE bit
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 9522d7e4cb5e0858122fc55d33a2c07728f0b10d
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Nov 16 00:23:31 2010 +0000

    ARM: pgtable: invert L_PTE_EXEC to L_PTE_XN
    
    The hardware page tables use an XN bit 'execute never'.  Historically,
    we've had a Linux 'execute allow' bit, in the positive sense.  Get rid
    of this artifact as future hardware will continue to have the XN sense.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit e926f4495e202500a6265987277fab217e235f08
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Sun Nov 21 11:55:37 2010 +0000

    ARM: pgtable: remove FIRST_USER_PGD_NR
    
    FIRST_USER_PGD_NR is now unnecessary, as this has been replaced by
    FIRST_USER_ADDRESS except in the architecture code.  Fix up the last
    usage of FIRST_USER_PGD_NR, and remove the definition.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit af3813d6a5bf8d0f71b23d3ce458fa5f9916c6b7
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Sun Nov 21 11:48:16 2010 +0000

    ARM: pgtable: use conventional page table code for identity mappings
    
    Remove some knowledge of our 2-level page table layout from the
    identity mapping code - we assume that a step size of PGDIR_SIZE will
    allow us to step over all entries.  While this is true today, it won't
    be true in the near future.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 614dd0585f376a25c638abbed9c5fbd21d7baece
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Sun Nov 21 11:41:57 2010 +0000

    ARM: pgtable: collect up identity mapping functions
    
    We have two places where we create identity mappings - one when we bring
    secondary CPUs online, and one where we setup some mappings for soft-
    reboot.  Combine these two into a single implementation.  Also collect
    the identity mapping deletion function.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit 26bbf0b57a0848932f725076bcb1245ca696e8d3
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Sun Nov 21 11:30:36 2010 +0000

    ARM: pgtable: remove L2 cache flushes for SMP page table bring-up
    
    The MMU is always configured to read page tables from the L2 cache
    so there's little point flushing them out of the L2 cache back to
    RAM.  Remove these flushes.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit d30e45eeabefadc6039d7f876a59e5f5f6cb11c6
Author: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date:   Tue Nov 16 00:16:01 2010 +0000

    ARM: pgtable: switch order of Linux vs hardware page tables
    
    This switches the ordering of the Linux vs hardware page tables in
    each page, thereby eliminating some of the arithmetic in the page
    table walks.  As we now place the Linux page table at the beginning
    of the page, we can deal with the offset in the pgt by simply masking
    it away, along with the other control bits.
    
    This also makes the arithmetic all be positive, rather than a mixture.
    
    Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

commit b93cef556162b0f33399bfe5f307c54f51554e09
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Thu Dec 2 16:25:43 2010 +0000

    mfd: Support additional parent IDs for wm831x
    
    Some newer device revisions add a second parent ID. Support this in
    the device validity checks done at startup.
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit 88aec4f7b67b5889ba5b4beac2d2c1400451c318
Author: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
Date:   Thu Dec 2 15:06:49 2010 +0100

    mfd: Fix ab8500-core interrupt ffs bit bug
    
    We want to find the first set bit on value, not status.
    
    Signed-off-by: Mattias Wallin <mattias.wallin@xxxxxxxxxxxxxx>
    Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit bd7c72ed18d719c1fb0fdf6ff9042d8ab78fdf71
Author: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Wed Nov 24 18:01:39 2010 +0000

    mfd: Supply IRQ base for WM832x devices
    
    Without this the IRQ base will not be correctly configured for the
    subdevices.
    
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit 3b3c1f24e96c411a95daabb6af9e09c5381f713b
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date:   Fri Nov 26 10:39:55 2010 +0100

    watchdog: Fix null pointer dereference while accessing rdc321x platform_data
    
    rdc321x-wdt currently fetches its driver specific data by using the
    platform_device->platform_data pointer, this is wrong because the mfd
    device which registers our platform_device has been added using
    mfd_add_device() which sets the platform_device->driver_data pointer
    instead.
    
    Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
    CC: stable@xxxxxxxxxx
    Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit fa6469cb5b2d16703464c344b943e2c025cb7858
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date:   Fri Nov 26 10:39:54 2010 +0100

    gpio: Fix null pointer dereference while accessing rdc321x platform_data
    
    rdc321x-gpio currently fetches its driver specific data by using the
    platform_device->platform_data pointer, this is wrong because the mfd
    device which registers our platform_device has been added using
    mfd_add_device() which sets the platform_device->driver_data pointer
    instead.
    
    Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
    CC: stable@xxxxxxxxxx
    Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx>

commit 8c1df4002aa425973d7d25ffa56c042acd953bed
Merge: 6c529a266bdc590a870ee2d2092ff6527eff427b 
21dd9ae5a4e9f717f3957ec934dd3158129436b8
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Dec 22 11:54:50 2010 +0100

    Merge branch 'perf/core' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

commit 6c529a266bdc590a870ee2d2092ff6527eff427b
Merge: 7639dae0ca11038286bbbcda05f2bef601c1eb8d 
90a8a73c06cc32b609a880d48449d7083327e11a
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Dec 22 11:53:20 2010 +0100

    Merge commit 'v2.6.37-rc7' into perf/core
    
    Merge reason: Pick up the latest -rc.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

commit 7d8f98769e7f4bc29c38789daeb416c6a7d7c241
Author: Tao Ma <boyu.mt@xxxxxxxxxx>
Date:   Wed Dec 22 17:50:30 2010 +0800

    ocfs2: Fix system inodes cache overflow.
    
    When we store system inodes cache in ocfs2_super,
    we use a array for global system inodes. But unfortunately,
    the range is calculated wrongly which makes it overflow and
    pollute ocfs2_super->local_system_inodes.
    This patch fix it by setting the range properly.
    
    The corresponding bug is ossbug1303.
    http://oss.oracle.com/bugzilla/show_bug.cgi?id=1303
    
    Cc: stable@xxxxxxxxxx
    Signed-off-by: Tao Ma <boyu.mt@xxxxxxxxxx>
    Signed-off-by: Joel Becker <joel.becker@xxxxxxxxxx>

commit 2ce494a3dac331fdbb2590e5fa0598956dd21b8b
Merge: 90a8a73c06cc32b609a880d48449d7083327e11a 
3b4694de3596edac0159524b15a4a06945875421
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Wed Dec 22 11:31:03 2010 +0100

    Merge branch 'perf/urgent' of 
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent

commit 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f
Author: Henrik Rydberg <rydberg@xxxxxxxxxxx>
Date:   Sat Dec 18 15:42:30 2010 +0100

    Input: synaptics - ignore bogus mt packet
    
    In multitouch mode, at least one device (fw: 7.4 id: 0x1c0b1) sometimes
    sends a final main packet with x == 1. Since the normal values are above
    1472, this is clearly bogus. At the same time, a two-finger touch is
    signaled, even though only one finger was on the pad to begin with. This
    patch ignores the packet altogether, removing the problem.
    
    Acked-by: Chris Bagwell <chris@xxxxxxxxxxxxxx>
    Acked-by: Chase Douglas <chase.douglas@xxxxxxxxxxxxx>
    Acked-by: Dmitry Torokhov <dtor@xxxxxxx>
    Signed-off-by: Henrik Rydberg <rydberg@xxxxxxxxxxx>

commit 4f32e9b1f812fd6c00cc85a127583fefbdedaedc
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
Date:   Wed Dec 22 10:27:53 2010 +0100

    kthread_work: make lockdep happy
    
    spinlock in kthread_worker and wait_queue_head in kthread_work both
    should be lockdep sensible, so change the interface to make it
    suiltable for CONFIG_LOCKDEP.
    
    tj: comment update
    
    Reported-by: Nicolas <nicolas.mailhot@xxxxxxxxxxx>
    Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
    Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Tested-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
    Cc: Tejun Heo <tj@xxxxxxxxxx>
    Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>

commit 11c8ea81cc639c2ea56f94a9cdaa6242ff13a3af
Author: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>
Date:   Fri Dec 17 21:16:23 2010 +0100

    ux500: rename modem IRQ and MBOX files
    
    Suffix the U5500 modem IRQ and MBOX files with *-db5500* so that
    we clearly know the SoC they belong to, in line with the rest of
    the files in mach-ux500.
    
    Cc: Stefan Nilsson <stefan.xk.nilsson@xxxxxxxxxxxxxx>
    Cc: Martin Persson <martin.persson@xxxxxxxxxxxxxx>
    Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxxxxxx>

commit 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date:   Wed Dec 22 06:35:30 2010 +0000

    ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
    
    Adding platform resources, PFC setting and release
    reset pin for eMMC on ag5evm.
    
    [damm@xxxxxxxxxxxxx: Add MSTP code for MMCIF]
    Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 5d7814728d80ee56d02e99cc2ab0850c8625a047
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date:   Wed Dec 22 06:30:19 2010 +0000

    ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
    
    Follow up to pfc-sh73a0.c's pull-up support.
    Change GPIO_FN_KEYINx to GPIO_FN_KEYINx_PU.
    
    Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit a0794fd019820d3d5e9d73ffd61b5bbcac818f18
Author: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
Date:   Wed Dec 22 06:26:06 2010 +0000

    ARM: mach-shmobile: sh73a0 GPIO pullup improvement
    
    On SH-Mobile, Pull UP/Downs can be controlled independently
    from Function selectors (by lower nibble of PFCR).
    It means people may want to use GPIO_FN_xxx_PU/PD in addition
    to GPIO_IN_PU/PD which is currently supported.
    This patch adds pull-up version for some input signals on
    KEYSC, MMC, FSIA as well as SDHI1.
    
    Signed-off-by: Takashi YOSHII <takashi.yoshii.zj@xxxxxxxxxxx>
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 019c4ae313ccf5d253be32197e002c626d8bd678
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Wed Dec 22 06:14:05 2010 +0000

    ARM: mach-shmobile: sh73a0 CPGA fix for KEYSC
    
    Fix the sh73a0 KEYSC clock control by adding MSTP403
    to mstp_clks[]. Use KEYSC instead of KEYSC0 in comments.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 8c1ac08b38af0c477ae32df9f4625b7dbddea1ea
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Tue Dec 21 11:46:35 2010 +0100

    fbdev: sh-mobile: retrieve and propagate display sizes from EDID
    
    Monitor EDID contains information about physical display sizes. Retrieve
    it and propagate to the framebuffer driver.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit e0b9fb26266778cc749365b98041c5b7ef6f10f8
Author: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
Date:   Tue Dec 21 11:46:26 2010 +0100

    fbdev: sh-mobile: restore display size configuration
    
    An earlier patch replaced open-coded video-mode configuration from
    platform data by a call to fb_videomode_to_var(), thereby setting
    ofdisplay sizes have been accidentally lost. Restore them.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 752a4a95e3c96a8e8d3405b16d292f13e8c7856b
Merge: bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 
90a8a73c06cc32b609a880d48449d7083327e11a
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date:   Wed Dec 22 00:10:01 2010 -0700

    Merge commit 'v2.6.37-rc7' into spi/next

commit 60a0e5d972bad6927b63aede7a1cfe758b8251ad
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date:   Tue Dec 21 22:37:29 2010 -0700

    OMAP4: clock data: Keep L3INSTR clock domain modulemode under HW control
    
    L3INSTR clock domain is read only register and its reset value is
    HW_AUTO. The modules withing this clock domain needs to be kept under
    hardware control.
    
    MODULEMODE:
    - 0x0: Module is disable by software. Any INTRCONN access to module
      results in an error, except if resulting from a module wakeup
      (asynchronous wakeup).
    - 0x1: Module is managed automatically by hardware according to
      clock domain transition. A clock domain sleep transition put
      module into idle. A wakeup domain transition put it back
      into function. If CLKTRCTRL=3, any INTRCONN access to module
      is always granted. Module clocks may be gated according to
      the clock domain state.
    
    This patch keeps CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL
    and CM_L3INSTR_INTRCONN_WP1_CLKCTRL module mode under hardware control
    by using ENABLE_ON_INIT flag.
    
    Without this the OMAP4 device OFF mode SAR restore phase aborts during
    interconnect register restore phase. This can be also handled by doing
    explicit a clock enable and disable in the low power code since there
    is no direct module associated with it. But that seems not necessary
    since the clock domain is under HW control.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Acked-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 80f093657371b3ebb1d05354a698088bf7b21c15
Author: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
Date:   Tue Dec 21 22:37:28 2010 -0700

    OMAP4: powerdomain: Remove L3INIT_PD OFF state
    
    On OMAP4, there is an issue when L3INIT transitions to OFF mode without
    device OFF. The SAR restore mechanism will not get triggered without
    wakeup from device OFF and hence the USB host and USB TLL context
    will not be restored.
    
    Hardware team recommended to remove the OFF state support for L3INIT_PD
    since there is no power impact. It will be removed on next OMAP revision
    (OMAP4440 and beyond).
    
    Hence this patch removed the OFF state from L3INIT_PD. The deepest
    state supported on L3INIT_PD is OSWR just like CORE_PD and PER_PD
    
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    [b-cousson@xxxxxx: update the changelog with next OMAP info]
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 474e7aeb6a5ac78071cc9b841889fcf026524e97
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 22:37:28 2010 -0700

    OMAP4: powerdomain: l4per pwrdm does not support OFF
    
    The l4per power domain in ES2.0 does support only RET and ON states.
    The previous ES1.0 HW database was wrong and thus fixed on ES2.
    Change the pwrsts field to reflect that.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Acked-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 33de32b3ebcb4f7f77f10a1b42493352f00c6a30
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 22:37:28 2010 -0700

    OMAP4: PM: Do not assume clkdm supports hw transitions
    
    omap_set_pwrdm_state today assumes a clkdm supports hw_auto
    transitions and hence leaves some which do not support this
    in sw wkup state preventing low power transitions.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Acked-by: Benoit Cousson <b-cousson@xxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 71a488dbcc4acbc9b845491a368b30ecd7484089
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 22:37:27 2010 -0700

    OMAP4: PM: Use the low-power state change feature on OMAP4
    
    For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking
    up the domain to put it back to deeper sleep state.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Acked-by: Benoit Cousson <b-cousson@xxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 73bc7d315f56e260071bdb5f15e25b53bddc1402
Author: Melchior FRANZ <mfranz@xxxxxx>
Date:   Wed Dec 22 02:04:33 2010 +0100

    USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
    
    So far the USBLED driver only supports Delcom's "USB Visual Signal
    Indicator" (http://www.delcomproducts.com/products_USBLMP.asp). The
    driver generates virtual files "red", "green", and "blue" under the
    device's /sys/ directory, where color values can be read from and
    written to.
    
    This patch adds support for Dream Cheeky's "DL100B Webmail Notifier"
    (http://www.dreamcheeky.com/webmail-notifier -- available from several
    shops, such as http://www.conrad.at/ce/de/product/777048/USB-WEBMAIL).
    This device isn't as pretty as Delcom's, but it's *far* cheaper, and
    its 3 LEDs can be set in 32 brightness steps each. The grey envelope
    contour can easily be removed, leaving a rather neutral white box (with
    a few small holes), which is useful for generic signalling purposes.
    Of course, the small circuit board can easily be put into a prettier
    case.
    
    The DL100B device pretends to be a HID, but the HID descriptor shows
    that it's not overly useful as such (see below). The patch therefore
    removes the "HID-ness" (hid-core.c, hid-ids.h), and adds the necessary
    commands to usbled.c. The protocol info comes from the developer's
    manual that Dream Cheeky kindly provided (815DeveloperManual.pdf).
    
    HID descriptor:
    
      0: 05 01   Usage Page 'Generic Desktop Controls'
      2: 09 10   Usage 'Reserved'
      4: a1 01   Collection 'Application (mouse, keyboard)'
      6: 05 00           Usage Page 'Undefined'
      8: 19 10           Usage Minimum = 16
     10: 29 11           Usage Maximum = 17
     12: 15 00           Logical Minimum = 0
     14: 25 0f           Logical Maximum = 15
     16: 75 08           Report Size = 8
     18: 95 08           Report Count = 8
     20: 91 02           Output data *var abs lin pref-state null-pos non-vol 
bit-field
     22: 19 10           Usage Minimum = 16
     24: 29 11           Usage Maximum = 17
     26: 15 00           Logical Minimum = 0
     28: 25 0f           Logical Maximum = 15
     30: 75 08           Report Size = 8
     32: 95 08           Report Count = 8
     34: 81 00           Input data array abs lin pref-state null-pos non-vol 
bit-field
     36: c0      End Collection
    
    Signed-off-by: Melchior FRANZ <mfranz@xxxxxx>
    Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

commit 5010f3db952b19cd353d1e90838818922d995697
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 21 08:40:59 2010 +0000

    ARM: mach-shmobile: sh73a0 TMU support
    
    Add support for 2 TMU timer channels on sh73a0.
    
    One timer channel is used for clocksource and
    the other is used for clockevents. All channels
    in the same TMU block share MSTP bit as usual.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 5f53a56af50c002cdb091914aa98df80b1b28ec8
Author: Magnus Damm <damm@xxxxxxxxxxxxx>
Date:   Tue Dec 21 08:37:32 2010 +0000

    ARM: mach-shmobile: sh73a0 INTCS support
    
    Add INTCS support for the sh73a0 processor.
    
    The interrupts on the sh73a0 processor are managed
    through controllers such as GIC, INTCS and INTCA.
    
    The ARM cores use the GIC as primary interrupt
    controller and the INTCS and INTCA are hanging off
    the GIC as cascaded interrupt controllers.
    
    Peripherals connected both to the GIC and the INTC
    controllers should if possible only use the GIC.
    
    If no GIC connection is available then INTCS and
    INTCA may be used instead.
    
    Signed-off-by: Magnus Damm <damm@xxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 354e4157d9e1529cf71c7041a22fde2fd113642b
Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Date:   Tue Dec 21 11:20:45 2010 +0000

    ARM: mach-shmobile: mackerel: fixup default memory size
    
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 6081dc348f122cdb76093b2fc6cf5742c968cb69
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 21 21:31:55 2010 -0700

    OMAP: PM noop: implement context loss count for non-omap_devices
    
    For devices which have not (yet) been converted to use omap_device,
    implement the context loss counter using the "brutal method" as
    originally proposed by Paul Walmsley[1].
    
    The dummy context loss counter is incremented every time it is
    checked, but only when off-mode is enabled.  When off-mode is
    disabled, the dummy counter stops incrementing.
    
    Tested on 36xx/Zoom3 using MMC driver, which is currently the
    only in-tree user of this API.
    
    This patch should be reverted after all devices are converted to using
    omap_device.
    
    [1] http://marc.info/?l=linux-omap&m=129176260000626&w=2
    
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    [paul@xxxxxxxxx: fixed compile warning; fixed to compile on OMAP1]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit c80705aa7074045e7431ed2ebeb0f7d5773615ab
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 21 21:31:55 2010 -0700

    OMAP: PM: implement context loss count APIs
    
    Implement OMAP PM layer omap_pm_get_dev_context_loss_count() API by
    creating similar APIs at the omap_device and omap_hwmod levels.  The
    omap_hwmod level call is the layer with access to the powerdomain
    core, so it is the place where the powerdomain is queried to get the
    context loss count.
    
    The new APIs return an unsigned value that can wrap as the
    context-loss count grows.  However, the wrapping is not important as
    the role of this function is to determine context loss by checking for
    any difference in subsequent calls to this function.
    
    Note that these APIs at each level can return zero when no context
    loss is detected, or on errors.  This is to avoid returning error
    codes which could potentially be mistaken for large context loss
    counters.
    
    NOTE: only works for devices which have been converted to use
          omap_device/omap_hwmod.
    
    Longer term, we could possibly remove this API from the OMAP PM layer,
    and instead directly use the omap_device level API.
    
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 7f595674e08b8b4d3faf64a19bccc95445d7ed35
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 21 21:31:55 2010 -0700

    OMAP2+: powerdomain: add API to get context loss count
    
    Add new powerdomain API
    
        u32 pwrdm_get_context_loss_count(struct powerdomain *pwrdm)
    
    for checking how many times the powerdomain has lost context.  The
    loss count is the sum of the powerdomain off-mode counter, the
    logic off counter and the per-bank memory off counter.
    
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    [paul@xxxxxxxxx: removed bogus return value on error; improved kerneldoc;
     tweaked commit message]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 0a01aa211da8530dc6a3ff3a725f2edd3464c46f
Author: Hari Kanigeri <h-kanigeri2@xxxxxx>
Date:   Tue Dec 21 21:18:56 2010 -0700

    OMAP4: clocks: add dummy clock for mailbox
    
    In omap4, there is no explicit configuration register to enable mailbox 
clocks.
    Defining dummy clock for mailbox clock module to keep the mailbox driver
    backward compatible with previous omaps.
    
    Signed-off-by: Hari Kanigeri <h-kanigeri2@xxxxxx>
    Acked-by: Benoît Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit a36795c1278112af2a78f93c99b7586cb7e2a0a2
Author: Jon Hunter <jon-hunter@xxxxxx>
Date:   Tue Dec 21 21:31:43 2010 -0700

    OMAP: clock: fix configuration of J-Type DPLLs to work for OMAP3 and OMAP4
    
    J-Type DPLLs have additional configuration parameters that need to
    be programmed when setting the multipler and divider for the DPLL.
    These parameters being the sigma delta divider (SD_DIV) for the DPLL
    and the digital controlled oscillator (DCO) to be used by the DPLL.
    
    The current code is implemented specifically to configure the
    OMAP3630 PER J-Type DPLL. The OMAP4430 USB DPLL is also a J-Type DPLL
    and so this code needs to be updated to work for both OMAP3 and OMAP4
    devices and any other future devices that have J-TYPE DPLLs.
    
    For the OMAP3630 PER DPLL both the SD_DIV and DCO paramenters are
    used but for the OMAP4430 USB DPLL only the SD_DIV field is used.
    The current implementation will only program the SD_DIV and DCO
    fields if the DPLL has both and hence this does not work for
    OMAP4430.
    
    In order to make the code more generic add two new fields to the
    dpll_data structure for the SD_DIV field and DCO field bit-masks
    and only program these fields if the masks are defined for a specific
    DPLL. This simplifies the code and allows us to remove the flag
    DPLL_NO_DCO_SEL.
    
    Tested on OMAP36xx Zoom3 and OMAP4 Blaze.
    
    Signed-off-by: Jon Hunter <jon-hunter@xxxxxx>
    [paul@xxxxxxxxx: removed explicit inlining and added '_' prefix on 
lookup_*()
     functions; added testing info to commit message; added 35xx comments back 
in]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit b183aaf7274245bb0241d81176cb6b06a3b01ca6
Author: Charulatha V <charu@xxxxxx>
Date:   Tue Dec 21 21:31:43 2010 -0700

    OMAP3: clock: Update clock domain name for mcspi fck
    
    Update clock3xxx_data for mcspi1-4 with appropriate clock domain name.
    
    Signed-off-by: Charulatha V <charu@xxxxxx>
    Signed-off-by: Govindraj.R <govindraj.raja@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 7cffa6b888c77e9386a6b886ef10bc57aac464ec
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:31:28 2010 -0700

    OMAP4: hwmod data: Add SIDLE_SMART_WKUP modes to several IPs
    
    uart, gpio, wd_timer and i2c does support the new smart-idle with wakeup
    added in OMAP4.
    
    Add the flag to allow the hwmod core to enable this mode when applicable.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit 86009eb326afde34ffdc5648cd344aa86b8d58d4
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:31:28 2010 -0700

    OMAP2+: hwmod: Add wakeup support for new OMAP4 IPs
    
    The new OMAP4 IPs introduced a new idle mode named smart-idle with wakeup.
    
    This new idlemode replaces the enawakeup for the new IPs but seems to
    coexist as well for some legacy IPs (UART, GPIO, MCSPI...)
    
    Add the new SIDLE_SMART_WKUP flag to mark the IPs that support this
    capability.
    The omap_hwmod_44xx_data.c will have to be updated to add this new flag.
    
    Enable this new mode when applicable in _enable_wakeup, _enable_sysc and
    _idle_sysc.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Tested-by: Sebastien Guiriec <s-guiriec@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit f2dd7e09db3e18e4c053810b72fe026685d9bf0c
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 21:31:28 2010 -0700

    OMAP2+: hwmod: Disable clocks when hwmod enable fails
    
    In cases where a module (hwmod) does not become accesible on enabling
    the main clocks (can happen if there are external clocks needed
    for the module to become accesible), make sure the clocks are not
    left enabled.
    This ensures that when the requisite external dependencies are met
    a omap_hwmod_enable and omap_hwmod_idle/shutdown would rightly enable
    and disable clocks using clk framework. Leaving the clocks enabled in
    the error case causes additional usecounting at the clock framework
    level leaving the clock enabled forever.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit ce35b2446945c506cb02960eab2072f56efdf1c0
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:31:28 2010 -0700

    OMAP2+: hwmod: Remove omap_hwmod_mutex
    
    The hwmod list will be built are init time and never
    be modified at runtime. There is no need anymore to protect
    the list from concurrent accesses using a mutex.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 01592df95049a6f3d4abb0571ae1c7cb6e9d1cd7
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:31:28 2010 -0700

    OMAP2+: hwmod: Mark functions used only during initialization with __init
    
    _register, _find_mpu_port_index and _find_mpu_rt_base are static APIs
    that will be used only during the omap_hwmod initialization phase.
    There is no need to keep them for runtime.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 0102b62789af5aed92cea4cf7f36afaa1ab12c72
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:31:27 2010 -0700

    OMAP2+: hwmod: Make omap_hwmod_register private and remove 
omap_hwmod_unregister
    
    Do not allow omap_hwmod_register to be used outside the core
    hwmod code. An omap_hwmod should be registered only at init time.
    Remove the omap_hwmod_unregister that is not used today since the
    hwmod list will be built once at init time and never be modified
    at runtime.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 50ebb7772c8975086dbfc3d21be74dd806650df4
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:34 2010 -0700

    OMAP2430: hwmod data: Use common dev_attr for i2c1 and i2c2
    
    Since i2c1 and i2c2 are using the same data, remove the two previous
    instances and use a common i2c_dev_attr one.
    
    Moreover, that will fix the following warning:
    arch/arm/mach-omap2/omap_hwmod_2430_data.c:485:
    warning: 'i2c_dev_attr' defined but not used
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Acked-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Charulatha V <charu@xxxxxx>

commit 5a7ddcbdaf1bb7603422fb6188156ccc39711b0f
Author: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 21 21:08:34 2010 -0700

    OMAP2+: omap_hwmod: fix wakeup enable/disable for consistency
    
    In the omap_hwmod core, most of the SYSCONFIG register helper
    functions do not directly write the register, but instead just modify
    a value passed in.
    
    This patch converts the _enable_wakeup() and _disable_wakeup() helper
    functions to take a value argument and only modify it instead of
    actually writing the register.  This makes the wakeup helpers
    consistent with the other helper functions and avoids unintentional
    problems like the following.
    
    This problem was found after discovering that GPIO wakeups were no
    longer functional.  The root cause was that the ENAWAKEUP bit of the
    SYSCONFIG register was being unintentionaly overwritten, leaving
    wakeups disabled after the following two commits were combined:
    
    commit: 9980ce53c97392a3dbdc9d1ac3e455d79b4167ed
            OMAP: hwmod: Enable module wakeup if in smartidle
    
    commit: 78f26e872f77b6312273216de1a8f836c6f2e143
            OMAP: hwmod: Set autoidle after smartidle during _sysc_enable
    
    There resulting in code in _enable_sysc() was this:
    
        /*
         * XXX The clock framework should handle this, by
         * calling into this code.  But this must wait until the
         * clock structures are tagged with omap_hwmod entries
         */
        if ((oh->flags & HWMOD_SET_DEFAULT_CLOCKACT) &&
            (sf & SYSC_HAS_CLOCKACTIVITY))
                _set_clockactivity(oh, oh->class->sysc->clockact, &v);
    
        _write_sysconfig(v, oh);
    
    so here, 'v' has wakeups disabled.
    
        /* If slave is in SMARTIDLE, also enable wakeup */
        if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE))
                _enable_wakeup(oh);
    
    Here wakeup is enabled in the SYSCONFIG register (but 'v' is not updated)
    
        /*
         * Set the autoidle bit only after setting the smartidle bit
         * Setting this will not have any impact on the other modules.
         */
        if (sf & SYSC_HAS_AUTOIDLE) {
                idlemode = (oh->flags & HWMOD_NO_OCP_AUTOIDLE) ?
                        0 : 1;
                _set_module_autoidle(oh, idlemode, &v);
                _write_sysconfig(v, oh);
        }
    
    And here, SYSCONFIG is updated again using 'v', which does not have
    wakeups enabled, resulting in ENAWAKEUP being cleared.
    
    Special thanks to Benoit Cousson for pointing out that wakeups were
    supposed to be automatically enabled when a hwmod is enabled, and thus
    helping target the root cause of this problem.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit b399bca897802db3f342b6f3032a19ab8f2af99b
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:34 2010 -0700

    OMAP4: hwmod & clock data: Fix GPIO opt_clks and ocp_if iclk
    
    Fix opt clocks name in clock framework and hwmod.
    
    Add the missing iclk in the ocp_if structure.
    
    Add the HWMOD_CONTROL_OPT_CLKS_IN_RESET flag to ensure
    the the GPIO optional clock is enable during reset.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Tested-by: Charulatha V <charu@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit 8f25bdc55d619bdd469a90b82743248680422507
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:34 2010 -0700

    OMAP4: hwmod data: Add IVA and DSP
    
    Add IVA and DSP hwmods in order to allow the pm code to
    initialize properly the processors devices during
    omap2_init_processor_devices.
    
    It will avoid the following warnings.
    _init_omap_device: could not find omap_hwmod for iva
    _init_omap_device: could not find omap_hwmod for dsp
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 659fa8222c0ca1061d74cb3282614c017f415fe5
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:34 2010 -0700

    OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW
    
    The DMM is a piece of interconnect that need to be configured properly
    for the tiler functionnality. It thus exposes some configuration registers
    that were missing previously.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 0cfe8751bbb8703bc77beb031eb6f4edf3d601d3
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:33 2010 -0700

    OMAP4: hwmod data: Add SYSS_HAS_RESET_STATUS flag
    
    Update the data for GPIO, UART, WD_TIMER and I2C in order to
    support the new reset status flag introduce in the following
    commit:
    commit 2cb068149c365f1c2b10f2ece6786139527dcc16
    OMAP: hwmod: Fix softreset status check for some new OMAP4 IPs
    
    Without this flag properly set, the reset is done, but the hwmod
    core code will not wait for the reset completion to continue its
    excecution.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Tested-by: Charulatha V <charu@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>
    Cc: Govindraj.R <govindraj.raja@xxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 3b54baad8a79cc252e9d6a5ccc796b4c8b2b7173
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:33 2010 -0700

    OMAP4: hwmod data: Fix hwmod entries order
    
    The original OMAP4 hwmod data files is fully generated from HW
    database. But since the file is introduced incrementaly along
    with driver that uses the data, it has to be splitted by the driver
    owner and then re-merged by the maintainer.
    Because of the similarity of the data, git is completely lost
    during such merge and thus the data does not look like the original one
    at the end.
    
    Re-order properly the structures to stay in sync with original data set.
    This makes it much easier to diff the autogenerated script output with
    what's in mainline, see differences, and generate patches for those
    diffs.  The goal is to stay in sync with the autogenerated data from now
    on.
    
    Add a comment that does contain all the IPs that can have a hwmod, but
    do not have it in the file for the moment. It gives a good indication
    of the progress.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    [paul@xxxxxxxxx: updated to apply against current core integration branch,
     commit message slightly amplified; fixed opt_clks_cnt whitespace]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>
    Cc: Govindraj.R <govindraj.raja@xxxxxx>
    Cc: Charulatha V <charu@xxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit 65ae65c9058eb41e9566ffd12699607c68b23e5f
Author: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
Date:   Tue Dec 21 21:08:15 2010 -0700

    OMAP1: clock_data: use runtime cpu / machine checks
    
    Otherwise multi-omap1 configurations may set wrong clock speed.
    
    Created and tested against l-o master on Amstrad Delta.
    
    Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 1124d2f9186ec9e42e1c3f78c20199ba2cb597e2
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP2/3: SRAM: add comment about crashes during a TLB miss
    
    Some users were observing crashes during the execution of CORE DVFS
    code from OCM RAM -- a locally-modified copy of the linux-omap code.
    Richard Woodruff tracked this down to a DTLB miss which had been
    inadvertently and intermittently caused by the local modifications.
    (The TLB miss caused the ARM MMU to attempt to walk the page tables
    stored in SDRAM, which was not possible since SDRAM is off-line for a
    portion of the CORE DVFS OCM RAM code.)
    
    Add a note to the OMAP2 & OMAP3 CORE DVFS SRAM code to warn others that
    changes may result in crashes here if they are not carefully tested.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Richard Woodruff <r-woodruff2@xxxxxx>
    Cc: Jon Hunter <jon-hunter@xxxxxx>
    Cc: Nishanth Menon <nm@xxxxxx>

commit f1f4b7703f8fd165ece458ae97ebddb2b62b2ce3
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP3: clock: fix incorrect rate display when switching MPU rate at boot
    
    The OMAP3 clock code contains some legacy code to allow the MPU rate
    to be specified as a kernel command line parameter.  If the 'mpurate'
    parameter is specified, the kernel will attempt to switch the MPU rate
    to this rate during boot.  As part of this process, a short message
    "Switched to new clocking rate" is generated -- and in this message,
    the "Core" clock rate and "MPU" clock rate are transposed.
    
    This patch ensures that the clock rates are displayed in the correct
    order.
    
    Thanks to Bruno Guerin <br.guerin@xxxxxxx> for reporting this bug and
    proposing a fix.  Thanks to Richard Woodruff <r-woodruff2@xxxxxx> for
    reviewing the problem and passing the report on.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Bruno Guerin <br.guerin@xxxxxxx>
    Cc: Richard Woodruff <r-woodruff2@xxxxxx>

commit 553d239aadc75bee70c7858ac4548d073cb3daff
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP3: clock: clarify usage of struct clksel_rate.flags and struct 
omap_clk.cpu
    
    Clarify the usage of the struct omap_clk.cpu flags (e.g., CK_*) to use
    bits only for individual SoC variants (e.g., CK_3430ES1, CK_3505,
    etc.).  Superset flags, such as CK_3XXX or CK_AM35XX, are now defined
    as disjunctions of individual SoC variant flags.  This simplifies the
    definition and use of these flags.  struct omap_clk record definitions
    can now simply specify the bitmask of actual SoCs that the records are
    valid for.  The clock init code can simply set a single CPU type mask
    bit for the SoC that is currently in use, and test against that,
    rather than needing to set some combination of flags.
    
    Similarly, clarify the use of struct clksel_rate.flags.  The bit
    allocated for RATE_IN_3XXX has been reassigned, and RATE_IN_3XXX has
    been defined as a disjunction of the 34xx and 36xx rate flags.  The
    advantages are the same as the above.
    
    Clarify the usage of struct omap_clk.cpu flags such as CK_34XX to only
    apply to the SoCs that they name, e.g., OMAP34xx chips.  The previous
    practice caused significantly different SoCs, such as OMAP36xx, to be
    included in CK_34XX.  In my opinion, this is much more intuitive.
    
    Similarly, clarify the use of struct clksel_rate.flags, such that
    RATE_IN_3430ES2PLUS now only applies to 34xx chips with ES level >= 2
    - it does not apply to OMAP36xx.
    
    ...
    
    At some point, it probably makes sense to collapse the CK_* and
    RATE_IN_* flags together into a single bitfield, and possibly use the
    existing CHIP_IS_OMAP* flags for platform detection.
    
    ...
    
    This all seems to work fine on OMAP34xx and OMAP36xx Beagle.  Not sure
    if it works on Sitara or the TI816X, unfortunately I don't have any
    here to test with.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit d4521f6731756c82a76d3e791c3ec2d28b38f97e
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP2xxx clock: fix dss2_fck recalc to use clksel
    
    dss2_fck is a clksel clock, and therefore its rate should be recalculated
    with the clksel mechanism.  This was working in early 2009, but was one of
    the casualties of the big OMAP clock merge between 2.6.29 and 2.6.30.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit cb13459b38c8f2e99df4923d2a71ce6db99f2436
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP4: clock data: Export control to enable/disable CORE/PER M3 clocks
    
    The CORE and PER M3 post dividers are different from the rest of the
    DPLL post dividers as in they go to SCRM, and are used
    there to export clocks for instance used by external sensor.
    
    There is no automatic HW dependency in PRCM to manage them. Hence these
    two clocks (dpll post dividers) should be managed by SW and explicitly
    enabled/disabled.
    
    Add control in clock framework to handle that.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit e0cb70c565acffb210ffa2a4590637d1844d13c5
Author: Rajendra Nayak <rnayak@xxxxxx>
Date:   Tue Dec 21 21:08:14 2010 -0700

    OMAP4: clock data: Add SCRM auxiliary clock nodes
    
    Add support for auxiliary clocks nodes which are part of SCRM.
    
    Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>

commit 768ab94f8b2b16a23fa10900430c10ec44f2643e
Author: Jonathan Bergsagel <jbergsagel@xxxxxx>
Date:   Tue Dec 21 21:08:13 2010 -0700

    OMAP4: clock data: Add missing fields in iva_hsd_byp_clk_mux_ck
    
    Add register address, mask and link to the clksel structure that
    were missing in the IVA DPLL mux clock node.
    
    Signed-off-by: Jonathan Bergsagel <jbergsagel@xxxxxx>
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit 032b5a7e3aa7dca8a13a79ff6a59232d307552a3
Author: Thara Gopinath <thara@xxxxxx>
Date:   Tue Dec 21 21:08:13 2010 -0700

    OMAP4: clock data: Add missing DPLL x2 clock nodes
    
    This patch extends the OMAP4 clock data to include
    various x2 clock nodes between DPLL and HS dividers as the
    clock framework skips a x2 while calculating the dpll locked
    frequency.
    
    The clock database extensions are autogenerated using
    the scripts maintained by Benoit Cousson.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Thara Gopinath <thara@xxxxxx>
    [paul@xxxxxxxxx: fixed merge conflicts against v2.6.37-rc5; dropped
     dpll_mpu_x2_ck on advice from Benoît]
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit ae4b4fc1bb59ad8802800a8103a6519acadcc9cf
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:13 2010 -0700

    OMAP3: clock data: Add "wkup_clkdm" in sr1_fck and sr2_fck
    
    The smartreflex modules belong to an ALWON_FCLK clock domain that
    does not have any SW control. The gating of that interface clock
    is triggered by a transition of the WKUP clock domain to idle.
    
    Attach both smartreflex instances on OMAP3 to the WKUP clock domain.
    
    The missing clock domain field in srX_fck clock nodes was reported by
    Kevin during the discussion about smartreflex on OMAP3:
    https://patchwork.kernel.org/patch/199342/
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>

commit d9b98f5f9e20389c43370539ef3de4aba7cf1d79
Author: Benoit Cousson <b-cousson@xxxxxx>
Date:   Tue Dec 21 21:08:13 2010 -0700

    OMAP4: clock data: Add control for pad_clks_ck and slimbus_clk
    
    The gating of pad_clks and slimbus_ck is controlled by the PRCM, but
    since the clock source is external, this is the SW responsability
    to gate / un-gate it when the mcpdm or slimbus module need to be used.
    There is no autogating possible with such external clock.
    
    Add SW control to enable / disable this SW gating in the pad_clks_ck
    and slimbus_clk clock node.
    
    Signed-off-by: Benoit Cousson <b-cousson@xxxxxx>
    Signed-off-by: Sebastien Guiriec <s-guiriec@xxxxxx>
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>

commit 596efe4792c50163578578bd4fe470f97652aad7
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:16 2010 -0700

    OMAP3: control/PM: move padconf save code to mach-omap2/control.c
    
    Move the padconf save code from pm34xx.c to the System Control Module
    code in mach-omap2/control.c.  This is part of the general push to
    move direct register access from middle-layer core code to low-level
    core code, so the middle-layer code can be abstracted to work on
    multiple platforms and cleaned up.
    
    In the medium-to-long term, this code should be called by the mux
    layer code, not the PM idle code.  This is because, according to the
    TRM, saving the padconf only needs to be done when the padconf
    changes[1].
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Tony Lindgren <tony@xxxxxxxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    
    1. OMAP34xx Multimedia Device Silicon Revision 3.1.x [Rev. ZH] [SWPU222H]
       Section 4.11.4 "Device Off-Mode Sequences"

commit 72e06d087204f3bc9acf281717b90ebf0b9731f7
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:16 2010 -0700

    OMAP2+: powerdomain: move header file from plat-omap to mach-omap2
    
    The OMAP powerdomain code and data is all OMAP2+-specific.  This seems
    unlikely to change any time soon.  Move plat-omap/include/plat/powerdomain.h
    to mach-omap2/powerdomain.h.  The primary point of doing this is to remove
    the temptation for unrelated upper-layer code to access powerdomain code
    and data directly.
    
    As part of this process, remove the references to powerdomain data
    from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap.
    Change the DSPBridge code to point to the new location for the
    powerdomain headers.  The DSPBridge code should not be including the
    powerdomain headers; these should be removed.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Omar Ramirez Luna <omar.ramirez@xxxxxx>
    Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
    Cc: Greg Kroah-Hartman <greg@xxxxxxxxx>

commit 1540f214065982e6cbc6b8da1fe65a15e358f7c5
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:15 2010 -0700

    OMAP2+: clockdomain: move header file from plat-omap to mach-omap2
    
    The OMAP clockdomain code and data is all OMAP2+-specific.  This seems
    unlikely to change any time soon.  Move plat-omap/include/plat/clockdomain.h
    to mach-omap2/clockdomain.h.  The primary point of doing this is to remove
    the temptation for unrelated upper-layer code to access clockdomain code
    and data directly.
    
    DSPBridge also uses the clockdomain headers for some reason, so,
    modify it also. The DSPBridge code should not be including the
    clockdomain headers; these should be removed.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Omar Ramirez Luna <omar.ramirez@xxxxxx>
    Cc: Felipe Contreras <felipe.contreras@xxxxxxxxx>
    Cc: Greg Kroah-Hartman <greg@xxxxxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>

commit 55ae35073b1c76f24c3736cf797c40d9932b19aa
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:15 2010 -0700

    OMAP2/3: clockdomain: remove unneeded .clkstctrl_reg, remove some direct CM 
register accesses
    
    Reverse some of the effects of commit
    84c0c39aec31a09571fc08a752a2f4da0fe9fcf2 ("ARM: OMAP4: PM: Make OMAP3
    Clock-domain framework compatible for OMAP4").  On OMAP2/3, the
    CM_CLKSTCTRL register is at a constant offset from the powerdomain's
    CM instance.
    
    Also, remove some of the direct CM register access from the
    clockdomain code, moving it to the OMAP2/3 CM code instead.  The
    intention here is to simplify the clockdomain code.  (The long-term
    goal is to move all direct CM register access across the OMAP core
    code to the appropriate cm*.c file.)
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>

commit bd2122ca358fbd5c8e94869ae731a0951b36c757
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:15 2010 -0700

    OMAP4: clockdomains: add OMAP4 PRCM data and OMAP4 support
    
    Add PRCM partition, CM instance register address offset, and clockdomain
    register address offset to each OMAP4 struct clockdomain record.  Add OMAP4
    clockdomain code to use this new data to access registers properly.
    
    While here, clean up some nearby clockdomain code to allocate auto variables
    in my recollection of Linus's preferred style.
    
    The autogeneration scripts have been updated.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>
    Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Cc: Benoît Cousson <b-cousson@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>

commit e4156ee52fe617c2c2d80b5db993ff4bf07d7c3c
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:15 2010 -0700

    OMAP4: CM instances: add clockdomain register offsets
    
    In OMAP4 CM instances, some registers (CM_CLKSTCTRL, CM_STATICDEP,
    CM_DYNAMICDEP, and the module-specific registers underneath) are
    organized by clockdomain.  Add the clockdomain offset macros to the
    appropriate PRCM module header files.
    
    This data was almost completely autogenerated from the TI hardware
    database; the autogeneration scripts have been updated.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Benoît Cousson <b-cousson@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>

commit b170fbe1f9f1aa38773b1bcf064ab65951ce739d
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:15 2010 -0700

    OMAP2+: clockdomains: split the clkdm hwsup enable/disable function
    
    Split _omap2_clkdm_set_hwsup() into _disable_hwsup() and _enable_hwsup().
    
    While here, also document that the autodeps are deprecated and that they
    should be removed at the earliest opportunity.
    
    The documentation has been fixed for _{enable,disable}_hwsup(), thanks
    to Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> for pointing out that those
    functions still had placeholder documentation in an earlier patch revision.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>

commit a64bb9cda8b12f599766c7dfe81770d2082a133a
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:14 2010 -0700

    OMAP4: powerdomains: add PRCM partition data; use OMAP4 PRM functions
    
    OMAP4 powerdomain control registers are split between the PRM hardware
    module and the PRCM_MPU local PRCM.  Add this PRCM partition
    information to each OMAP4 powerdomain record, and convert the OMAP4
    powerdomain function implementations to use the OMAP4 PRM instance
    functions.
    
    Also fixes a potential null pointer dereference of pwrdm->name.
    
    The autogeneration scripts have been updated.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>
    Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Cc: Benoît Cousson <b-cousson@xxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>

commit c4d7e58fb52c632d8e33cd23a4917d7a7f8302ac
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:14 2010 -0700

    OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_"
    
    Now that OMAP4-specific PRCM functions have been added, distinguish the
    existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_".
    
    This patch should not result in any functional change.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
    Cc: Jarkko Nikula <jhnikula@xxxxxxxxx>
    Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxx>
    Cc: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
    Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>

commit dac9a77120e2724e22696f06f3ecb4838da1e3e4
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:14 2010 -0700

    OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file
    
    Move the OMAP4 global software reset function to the OMAP4-specific
    prm44xx.c file, where it belongs.  Part of the long-term process of
    moving all of the direct PRCM register writes into lower-layer code.
    
    Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU
    will continue executing while the system is supposed to be resetting
    itself.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Tested-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
    Tested-by: Rajendra Nayak <rnayak@xxxxxx>

commit 2ace831ffc8feaffb8bc03da89ff43d948efdc97
Author: Paul Walmsley <paul@xxxxxxxxx>
Date:   Tue Dec 21 21:05:14 2010 -0700

    OMAP4: PRCM: add OMAP4-specific accessor/mutator functions
    
    In some ways, the OMAP4 PRCM register layout is quite different than
    the OMAP2/3 PRCM register layout.  For example, on OMAP2/3, from a
    register layout point of view, all CM instances were located in the CM
    subsystem, and all PRM instances were located in the PRM subsystem.
    OMAP4 changes this.  Now, for example, some CM instances, such as
    WKUP_CM and EMU_CM, are located in the system PRM subsystem.  And a
    "local PRCM" exists for the MPU - this PRCM combines registers that
    would normally appear in both CM and PRM instances, but uses its own
    register layout which matches neither the OMAP2/3 PRCM layout nor the
    OMAP4 PRCM layout.
    
    To try to deal with this, introduce some new functions, omap4_cminst*
    and omap4_prminst*.  The former is to be used when writing to a CM
    instance register (no matter what subsystem or hardware module it
    exists in), and the latter, similarly, with PRM instance registers.
    To determine which "PRCM partition" to write to, the functions take a
    PRCM instance ID argument.  Subsequent patches add these partition IDs
    to the OMAP4 powerdomain and clockdomain definitions.
    
    As far as I can see, there's really no good way to handle these types
    of register access inconsistencies.  This patch seemed like the least
    bad approach.
    
    Moving forward, the long-term goal is to remove all direct PRCM
    register access from the PM code.  PRCM register access should go
    through layers such as the powerdomain and clockdomain code that can
    hide the details of how to interact with the specific hardware
    variant.
    
    While here, rename cm4xxx.c to cm44xx.c to match the naming convention
    of the other OMAP4 PRCM files.
    
    Thanks to Santosh Shilimkar <santosh.shilimkar@xxxxxx>, Rajendra Nayak
    <rnayak@xxxxxx>, and Benoît Cousson <b-cousson@xxxxxx> for some comments.
    
    Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
    Cc: Benoît Cousson <b-cousson@xxxxxx>
    Cc: Rajendra Nayak <rnayak@xxxxxx>
    Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx>

commit 227fb925d3d3c5e565c1f1323a530564509195f2
Author: Don Fry <pcnet32@xxxxxxxxxxxx>
Date:   Tue Dec 21 19:58:15 2010 -0800

    MAINTAINERS: email address change
    
    My ISP has changed and therefore my email address.
    
    Signed-off-by: Don Fry <pcnet32@xxxxxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>

commit 17d6ce11195fceda62af00beefde37e37a01337c
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:22 2010 +0200

    sisfb: eliminate compiler warnings
    
    Convert some bit masks to 8-bit values to avoid the following compiler
    warnings:
    
    drivers/video/sis/sis_main.c:3858: warning: large integer implicitly 
truncated to unsigned type
    drivers/video/sis/init301.c:5855: warning: large integer implicitly 
truncated to unsigned type
    drivers/video/sis/init301.c:5869: warning: large integer implicitly 
truncated to unsigned type
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 114776776a8e38fff5772efeef68fc3fdde76a82
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:21 2010 +0200

    sisfb: delete unused register I/O macros
    
    Delete unused register I/O macros.
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit ad78adb4e814104510da421a38cfe89ab018a8b1
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:20 2010 +0200

    sisfb: replace setSISIDXREG with SiS_SetRegANDOR
    
    Replace setSISIDXREG() with SiS_SetRegANDOR().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 667a8b4114641895c90f8c98db1678c0bfa056df
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:19 2010 +0200

    sisfb: replace andSISIDXREG with SiS_SetRegAND
    
    Replace andSISIDXREG() with SiS_SetRegAND().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 27799d6c40828d5983fb1778ad3089740b946af8
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:18 2010 +0200

    sisfb: replace orSISIDXREG with SiS_SetRegOR
    
    Replace orSISIDXREG() with SiS_SetRegOR().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit 44b751bbe1fb6e7a75bbdee2d0c5f3ee133d6b0f
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:17 2010 +0200

    sisfb: replace outSISIDXREG with SiS_SetReg
    
    Replace outSISIDXREG() with SiS_SetReg().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>

commit e57d413681b6d9c3d256eeac1e34f0d1b8b81e26
Author: Aaro Koskinen <aaro.koskinen@xxxxxx>
Date:   Mon Dec 20 23:50:16 2010 +0200

    sisfb: replace inSISIDXREG with SiS_GetReg
    
    Replace inSISIDXREG() with SiS_GetReg().
    
    Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
    Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx>
    Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx&g