]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoReplace the bubble sort in sanitize_e820_map() with a call to the generic
Mike Ditto [Wed, 24 Aug 2011 23:46:17 +0000 (09:46 +1000)]
Replace the bubble sort in sanitize_e820_map() with a call to the generic
kernel sort function to avoid pathological performance with large maps.

On large (thousands of entries) E820 maps, the previous code took minutes
to run; with this change it's now milliseconds.

Signed-off-by: Mike Ditto <mditto@google.com>
Cc: Stefan Assmann <sassmann@kpanic.de>
Cc: Nancy Yuen <yuenn@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoCc: Ed Wildgoose <git@wildgooses.com>
Andrew Morton [Wed, 24 Aug 2011 23:46:17 +0000 (09:46 +1000)]
Cc: Ed Wildgoose <git@wildgooses.com>
Cc: Ed Wildgoose <kernel@wildgooses.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoThis new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Ed Wildgoose [Wed, 24 Aug 2011 23:46:16 +0000 (09:46 +1000)]
This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
driver that controls the LEDs through the leds-gpio driver.  The old
driver accessed GPIOs directly, which created a conflict and prevented
also loading the cs5535-gpio driver to read other GPIOs on the Alix board.
 With this new driver, we hook into leds-gpio which in turn uses GPIO to
control the LEDs and therefore it's possible to control both the LEDs and
access onboard GPIOs

Driver is moved to platform/geode and any other geode initialisation
modules should move here also.

This driver is inspired by leds-net5501.c by Alessandro Zummo.

Ideally, leds-net5501.c should also be moved to platform/geode.
Additionally the driver relies on parts of the patch: 7f131cf3ed ("leds:
leds-alix2c - take port address from MSR) by Daniel Mack to perform
detection of the Alix board.

Signed-off-by: Ed Wildgoose <kernel@wildgooses.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Daniel Mack <daniel@caiaq.de>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoOn x86_32 casting the unsigned int result of get_random_int() to long may
Ludwig Nussel [Wed, 24 Aug 2011 23:46:16 +0000 (09:46 +1000)]
On x86_32 casting the unsigned int result of get_random_int() to long may
result in a negative value.  On x86_32 the range of mmap_rnd() therefore
was -255 to 255.  The 32bit mode on x86_64 used 0 to 255 as intended.

The bug was introduced by 675a081 ("x86: unify mmap_{32|64}.c") in January
2008.

Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoThis makes the iris driver use the platform API, so it is properly exposed
Shérab [Wed, 24 Aug 2011 23:46:15 +0000 (09:46 +1000)]
This makes the iris driver use the platform API, so it is properly exposed
in /sys.

[akpm@linux-foundation.org: remove commented-out code, add missing space to printk, clean up code layout]
Signed-off-by: Shérab <Sebastien.Hinderer@ens-lyon.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoAdd support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Clay Carpenter [Wed, 24 Aug 2011 23:46:15 +0000 (09:46 +1000)]
Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:

acerhdf: unknown (unsupported) BIOS version Acer/Aspire 1410/v1.3314,
please report, aborting!

Signed-off-by: Clay Carpenter <claycarpenter@gmail.com>
Signed-off-by: Peter Feuerer <peter@piie.net>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoSince the commit below which added O_PATH support to the *at() calls, the
Andy Whitcroft [Wed, 24 Aug 2011 23:46:15 +0000 (09:46 +1000)]
Since the commit below which added O_PATH support to the *at() calls, the
error return for readlink/readlinkat for the empty pathname has switched
from ENOENT to EINVAL:

  commit 65cfc6722361570bfe255698d9cd4dccaf47570d
  Author: Al Viro <viro@zeniv.linux.org.uk>
  Date:   Sun Mar 13 15:56:26 2011 -0400

    readlinkat(), fchownat() and fstatat() with empty relative pathnames

This is both unexpected for userspace and makes readlink/readlinkat
inconsistant with all other interfaces; and inconsistant with our stated
return for these pathnames.

As the readlinkat call does not have a flags parameter we cannot use the
AT_EMPTY_PATH approach used in the other calls.  Therefore expose whether
the original path is infact entry via a new user_path_at_empty() path
lookup function.  Use this to determine whether to default to EINVAL or
ENOENT for failures.

BugLink: http://bugs.launchpad.net/bugs/817187
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoThe parameter's origin type is long. On an i386 architecture, it can
hank [Wed, 24 Aug 2011 23:46:14 +0000 (09:46 +1000)]
The parameter's origin type is long.  On an i386 architecture, it can
easily be larger than 0x80000000, causing this function to convert it to a
sign-extended u64 type.  Change the type to unsigned long so we get the
correct result.

[akpm@linux-foundation.org: build fix]
Signed-off-by: hank <pyu@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoFix kconfig unmet dependency warning. BACKLIGHT_CLASS_DEVICE depends on
Randy Dunlap [Wed, 24 Aug 2011 23:46:13 +0000 (09:46 +1000)]
Fix kconfig unmet dependency warning.  BACKLIGHT_CLASS_DEVICE depends on
BACKLIGHT_LCD_SUPPORT, so select the latter along with the former.

warning: (DRM_RADEON_KMS && DRM_I915 && STUB_POULSBO && FB_BACKLIGHT && PANEL_SHARP_LS037V7DW01 && PANEL_ACX565AKM && USB_APPLEDISPLAY && FB_OLPC_DCON && ASUS_LAPTOP && SONY_LAPTOP && THINKPAD_ACPI && EEEPC_LAPTOP && ACPI_ASUS && ACPI_CMPC && SAMSUNG_Q10) selects BACKLIGHT_CLASS_DEVICE which has unmet direct dependencies (HAS_IOMEM && BACKLIGHT_LCD_SUPPORT)

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoWhen no floppy is found the module code can be released while a timer
Carsten Emde [Wed, 24 Aug 2011 23:46:13 +0000 (09:46 +1000)]
When no floppy is found the module code can be released while a timer
function is pending or about to be executed.

CPU0                                  CPU1
      floppy_init()
timer_softirq()
   spin_lock_irq(&base->lock);
   detach_timer();
   spin_unlock_irq(&base->lock);
   -> Interrupt
del_timer();
        return -ENODEV;
                                      module_cleanup();
   <- EOI
   call_timer_fn();
   OOPS

Use del_timer_sync() to prevent this.

Signed-off-by: Carsten Emde <C.Emde@osadl.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
13 years agoMerge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Tue, 20 Sep 2011 07:03:33 +0000 (17:03 +1000)]
Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h

13 years agoMerge remote-tracking branch 'moduleh/module.h-split'
Stephen Rothwell [Tue, 20 Sep 2011 06:56:52 +0000 (16:56 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
arch/arm/mach-bcmring/mm.c
drivers/s390/char/vmur.c
drivers/scsi/libfc/fc_lport.c
include/linux/dmaengine.h

13 years agoMerge remote-tracking branch 'writeback/next'
Stephen Rothwell [Tue, 20 Sep 2011 06:55:27 +0000 (16:55 +1000)]
Merge remote-tracking branch 'writeback/next'

13 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 06:50:27 +0000 (16:50 +1000)]
Merge remote-tracking branch 'tmem/linux-next'

13 years agoMerge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 20 Sep 2011 06:46:30 +0000 (16:46 +1000)]
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c

13 years agoMerge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:51:53 +0000 (15:51 +1000)]
Merge remote-tracking branch 'usb/usb-next'

13 years agoMerge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:49:56 +0000 (15:49 +1000)]
Merge remote-tracking branch 'tty/tty-next'

13 years agoMerge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:43:35 +0000 (15:43 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
arch/arm/plat-mxc/devices.c

13 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:42:11 +0000 (15:42 +1000)]
Merge remote-tracking branch 'regmap/for-next'

Conflicts:
drivers/mfd/wm831x-spi.c

13 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Tue, 20 Sep 2011 05:16:33 +0000 (15:16 +1000)]
Merge remote-tracking branch 'namespace/master'

13 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Tue, 20 Sep 2011 05:15:10 +0000 (15:15 +1000)]
Merge remote-tracking branch 'sysctl/master'

13 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:13:40 +0000 (15:13 +1000)]
Merge remote-tracking branch 'percpu/for-next'

13 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:12:23 +0000 (15:12 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

13 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 05:10:56 +0000 (15:10 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'

13 years agoMerge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Tue, 20 Sep 2011 05:05:29 +0000 (15:05 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'

13 years agoMerge remote-tracking branch 'ptrace/ptrace'
Stephen Rothwell [Tue, 20 Sep 2011 04:59:36 +0000 (14:59 +1000)]
Merge remote-tracking branch 'ptrace/ptrace'

13 years agoMerge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:58:11 +0000 (14:58 +1000)]
Merge remote-tracking branch 'kvm/linux-next'

13 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:51:45 +0000 (14:51 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

13 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 20 Sep 2011 04:45:24 +0000 (14:45 +1000)]
Merge remote-tracking branch 'tip/auto-latest'

13 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:45:16 +0000 (14:45 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'

Conflicts:
drivers/of/base.c

13 years agoMerge remote-tracking branch 'i7300_edac/linux_next'
Stephen Rothwell [Tue, 20 Sep 2011 04:43:55 +0000 (14:43 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'

Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c

13 years agoMerge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Tue, 20 Sep 2011 04:42:10 +0000 (14:42 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'

13 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:39:27 +0000 (14:39 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'

13 years agoMerge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:38:06 +0000 (14:38 +1000)]
Merge remote-tracking branch 'apm/for-next'

13 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:31:56 +0000 (14:31 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c

13 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:27:51 +0000 (14:27 +1000)]
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/PCI/pci.txt
drivers/net/Kconfig

13 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:26:26 +0000 (14:26 +1000)]
Merge remote-tracking branch 'osd/linux-next'

13 years agoMerge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:25:06 +0000 (14:25 +1000)]
Merge remote-tracking branch 'iommu/next'

13 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Tue, 20 Sep 2011 04:23:40 +0000 (14:23 +1000)]
Merge remote-tracking branch 'watchdog/master'

13 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:23:00 +0000 (14:23 +1000)]
Merge remote-tracking branch 'agp/agp-next'

13 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 20 Sep 2011 04:20:23 +0000 (14:20 +1000)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:19:01 +0000 (14:19 +1000)]
Merge remote-tracking branch 'voltage/for-next'

13 years agoMerge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:17:41 +0000 (14:17 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'

13 years agoMerge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:16:18 +0000 (14:16 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'

13 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:14:58 +0000 (14:14 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'

Conflicts:
drivers/video/Kconfig

13 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:13:30 +0000 (14:13 +1000)]
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/mfd/max8997.c
drivers/rtc/rtc-twl.c

13 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:10:18 +0000 (14:10 +1000)]
Merge remote-tracking branch 'md/for-next'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:04:01 +0000 (14:04 +1000)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:03:53 +0000 (14:03 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Tue, 20 Sep 2011 04:02:32 +0000 (14:02 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

13 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Tue, 20 Sep 2011 04:02:25 +0000 (14:02 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

13 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Tue, 20 Sep 2011 04:00:39 +0000 (14:00 +1000)]
Merge remote-tracking branch 'battery/master'

13 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Tue, 20 Sep 2011 03:59:07 +0000 (13:59 +1000)]
Merge branch 'quilt/device-mapper'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 03:53:15 +0000 (13:53 +1000)]
Merge remote-tracking branch 'block/for-next'

13 years agoRevert "Input: gpio_keys - use of_property_read_u32()"
Stephen Rothwell [Tue, 20 Sep 2011 03:51:32 +0000 (13:51 +1000)]
Revert "Input: gpio_keys - use of_property_read_u32()"

This reverts commit d6ba97c9806bff7c91fe3ae5fec83488b1a56f73.

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 20 Sep 2011 03:50:40 +0000 (13:50 +1000)]
Merge remote-tracking branch 'input/next'

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Tue, 20 Sep 2011 03:49:21 +0000 (13:49 +1000)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 20 Sep 2011 03:48:04 +0000 (13:48 +1000)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 03:46:41 +0000 (13:46 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 03:44:48 +0000 (13:44 +1000)]
Merge remote-tracking branch 'sound/for-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:39:26 +0000 (13:39 +1000)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:38:08 +0000 (13:38 +1000)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-usb-a9260.c

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:29:48 +0000 (13:29 +1000)]
Merge remote-tracking branch 'bluetooth/master'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 20 Sep 2011 03:28:12 +0000 (13:28 +1000)]
Merge remote-tracking branch 'wireless/master'

Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:52:17 +0000 (12:52 +1000)]
Merge remote-tracking branch 'net/master'

Conflicts:
MAINTAINERS
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/s390/cio/qdio_main.c

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 20 Sep 2011 02:43:29 +0000 (12:43 +1000)]
Merge remote-tracking branch 'slave-dma/next'

13 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:23 +0000 (12:41 +1000)]
Merge remote-tracking branch 'scsi/master'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:19 +0000 (12:41 +1000)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:41:14 +0000 (12:41 +1000)]
Merge remote-tracking branch 'swiotlb/master'

13 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:39:57 +0000 (12:39 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

13 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 20 Sep 2011 02:38:33 +0000 (12:38 +1000)]
Merge remote-tracking branch 'libata/NEXT'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:38:28 +0000 (12:38 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:37:04 +0000 (12:37 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 20 Sep 2011 02:35:44 +0000 (12:35 +1000)]
Merge remote-tracking branch 'docs/docs-move'

13 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 20 Sep 2011 02:34:33 +0000 (12:34 +1000)]
Merge branch 'quilt/kernel-doc'

13 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:33:13 +0000 (12:33 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

13 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 20 Sep 2011 02:32:00 +0000 (12:32 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 20 Sep 2011 02:30:42 +0000 (12:30 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Tue, 20 Sep 2011 02:29:30 +0000 (12:29 +1000)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:28:12 +0000 (12:28 +1000)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:26:45 +0000 (12:26 +1000)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:25:32 +0000 (12:25 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

Conflicts:
net/9p/trans_virtio.c

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:24:04 +0000 (12:24 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:18:08 +0000 (12:18 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:16:55 +0000 (12:16 +1000)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:15:40 +0000 (12:15 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 20 Sep 2011 02:14:20 +0000 (12:14 +1000)]
Merge remote-tracking branch 'ext4/dev'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:13:04 +0000 (12:13 +1000)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 02:11:50 +0000 (12:11 +1000)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:10:39 +0000 (12:10 +1000)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 20 Sep 2011 02:09:29 +0000 (12:09 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 20 Sep 2011 02:08:16 +0000 (12:08 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 20 Sep 2011 02:07:04 +0000 (12:07 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 20 Sep 2011 02:05:53 +0000 (12:05 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 20 Sep 2011 01:59:36 +0000 (11:59 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 20 Sep 2011 01:58:20 +0000 (11:58 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 20 Sep 2011 01:57:07 +0000 (11:57 +1000)]
Merge remote-tracking branch 'powerpc/next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:55:47 +0000 (11:55 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:54:27 +0000 (11:54 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 20 Sep 2011 01:53:15 +0000 (11:53 +1000)]
Merge remote-tracking branch 'm68k/for-next'