]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 11 Oct 2012 01:56:52 +0000 (12:56 +1100)]
Merge remote-tracking branch 'signal/for-next'
Conflicts:
arch/arm/include/asm/thread_info.h
arch/c6x/Kconfig
arch/m68k/Kconfig
arch/mn10300/Kconfig
arch/powerpc/Kconfig
Stephen Rothwell [Thu, 11 Oct 2012 01:43:15 +0000 (12:43 +1100)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:41:32 +0000 (12:41 +1100)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:39:46 +0000 (12:39 +1100)]
Merge remote-tracking branch 'kvmtool/master'
Stephen Rothwell [Thu, 11 Oct 2012 01:39:38 +0000 (12:39 +1100)]
Merge remote-tracking branch 'samsung/for-next'
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Stephen Rothwell [Thu, 11 Oct 2012 01:37:47 +0000 (12:37 +1100)]
Merge remote-tracking branch 'renesas/next'
Conflicts:
arch/arm/Kconfig
Stephen Rothwell [Thu, 11 Oct 2012 01:35:53 +0000 (12:35 +1100)]
Merge remote-tracking branch 'ixp4xx/next'
Conflicts:
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
Stephen Rothwell [Thu, 11 Oct 2012 01:35:44 +0000 (12:35 +1100)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:34:05 +0000 (12:34 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:32:21 +0000 (12:32 +1100)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:32:14 +0000 (12:32 +1100)]
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/net/tun.c
Stephen Rothwell [Thu, 11 Oct 2012 01:30:22 +0000 (12:30 +1100)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:28:35 +0000 (12:28 +1100)]
Merge remote-tracking branch 'writeback/writeback-for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:22:16 +0000 (12:22 +1100)]
Merge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:20:09 +0000 (12:20 +1100)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:20:06 +0000 (12:20 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:18:26 +0000 (12:18 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Thu, 11 Oct 2012 01:10:51 +0000 (12:10 +1100)]
Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/asm/kvm_para.h
Stephen Rothwell [Thu, 11 Oct 2012 00:52:45 +0000 (11:52 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'
Conflicts:
mm/kmemleak.c
Stephen Rothwell [Thu, 11 Oct 2012 00:50:41 +0000 (11:50 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Thu, 11 Oct 2012 00:43:11 +0000 (11:43 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
mm/huge_memory.c
mm/mempolicy.c
Stephen Rothwell [Thu, 11 Oct 2012 00:41:24 +0000 (11:41 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Thu, 11 Oct 2012 00:41:12 +0000 (11:41 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Thu, 11 Oct 2012 00:39:13 +0000 (11:39 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Thu, 11 Oct 2012 00:37:34 +0000 (11:37 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Thu, 11 Oct 2012 00:35:24 +0000 (11:35 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 11 Oct 2012 00:33:38 +0000 (11:33 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 11 Oct 2012 00:33:32 +0000 (11:33 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 11 Oct 2012 00:31:48 +0000 (11:31 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
drivers/video/epson1355fb.c
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dispc.c
Stephen Rothwell [Thu, 11 Oct 2012 00:26:29 +0000 (11:26 +1100)]
Merge remote-tracking branch 'md/for-next'
Conflicts:
drivers/md/raid0.c
fs/bio.c
Stephen Rothwell [Thu, 11 Oct 2012 00:24:26 +0000 (11:24 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 11 Oct 2012 00:22:45 +0000 (11:22 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 11 Oct 2012 00:20:56 +0000 (11:20 +1100)]
Merge branch 'quilt/device-mapper'
Conflicts:
drivers/md/dm-thin.c
drivers/md/dm.c
Stephen Rothwell [Thu, 11 Oct 2012 00:13:54 +0000 (11:13 +1100)]
Merge remote-tracking branch 'block/for-next'
Conflicts:
init/Kconfig
Stephen Rothwell [Thu, 11 Oct 2012 00:13:45 +0000 (11:13 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 11 Oct 2012 00:11:40 +0000 (11:11 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 11 Oct 2012 00:06:17 +0000 (11:06 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Conflicts:
Makefile
arch/Kconfig
arch/alpha/Kconfig
arch/arm/Kconfig
arch/cris/include/asm/Kbuild
arch/h8300/include/asm/Kbuild
arch/m32r/include/asm/Kbuild
arch/s390/Kconfig
arch/x86/Kconfig
arch/x86/um/Kconfig
arch/xtensa/Kconfig
init/Kconfig
lib/Makefile
Stephen Rothwell [Thu, 11 Oct 2012 00:01:08 +0000 (11:01 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:23:00 +0000 (10:23 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:21:10 +0000 (10:21 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 10 Oct 2012 23:19:35 +0000 (10:19 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Wed, 10 Oct 2012 23:17:54 +0000 (10:17 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 10 Oct 2012 23:15:33 +0000 (10:15 +1100)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:13:49 +0000 (10:13 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:13:40 +0000 (10:13 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Wed, 10 Oct 2012 23:11:54 +0000 (10:11 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Wed, 10 Oct 2012 23:09:55 +0000 (10:09 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:07:56 +0000 (10:07 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-davinci/include/mach/da8xx.h
Stephen Rothwell [Wed, 10 Oct 2012 23:06:07 +0000 (10:06 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 10 Oct 2012 23:04:36 +0000 (10:04 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 10 Oct 2012 23:02:59 +0000 (10:02 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Conflicts:
drivers/i2c/busses/i2c-omap.c
Stephen Rothwell [Wed, 10 Oct 2012 23:01:17 +0000 (10:01 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 10 Oct 2012 23:01:15 +0000 (10:01 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-multitouch.c
Stephen Rothwell [Wed, 10 Oct 2012 22:54:29 +0000 (09:54 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:52:56 +0000 (09:52 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:49:29 +0000 (09:49 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:47:47 +0000 (09:47 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:45:57 +0000 (09:45 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:44:22 +0000 (09:44 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 10 Oct 2012 22:42:40 +0000 (09:42 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:41:07 +0000 (09:41 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 10 Oct 2012 22:41:00 +0000 (09:41 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Conflicts:
arch/xtensa/boot/boot-elf/Makefile
scripts/mod/modpost.c
Stephen Rothwell [Wed, 10 Oct 2012 22:39:19 +0000 (09:39 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 10 Oct 2012 22:37:36 +0000 (09:37 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Wed, 10 Oct 2012 22:35:39 +0000 (09:35 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Wed, 10 Oct 2012 22:34:07 +0000 (09:34 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:32:37 +0000 (09:32 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Wed, 10 Oct 2012 22:31:03 +0000 (09:31 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 10 Oct 2012 22:29:31 +0000 (09:29 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:28:01 +0000 (09:28 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 10 Oct 2012 22:27:50 +0000 (09:27 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
arch/arm/mach-bcmring/arch.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
Stephen Rothwell [Wed, 10 Oct 2012 22:23:53 +0000 (09:23 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 10 Oct 2012 22:16:50 +0000 (09:16 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Wed, 10 Oct 2012 22:16:33 +0000 (09:16 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Wed, 10 Oct 2012 22:15:59 +0000 (09:15 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Wed, 10 Oct 2012 22:15:52 +0000 (09:15 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 10 Oct 2012 22:15:51 +0000 (09:15 +1100)]
Merge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Wed, 10 Oct 2012 22:15:47 +0000 (09:15 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Jean Delvare [Wed, 10 Oct 2012 21:43:52 +0000 (08:43 +1100)]
hwmon: Drop needless includes of <linux/delay.h>
These drivers use no sleep or delay functions so they don't need to
include <linux/delay.h>.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Cc: Rudolf Marek <r.marek@assembler.cz>
Jean Delvare [Wed, 10 Oct 2012 21:43:52 +0000 (08:43 +1100)]
hwmon: Add missing inclusions of <linux/err.h>
These drivers use IS_ERR so they should include <linux/err.h>.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Luca Tettamanti <kronos.it@gmail.com>
Cc: Henrik Rydberg <rydberg@euromail.se>
Jean Delvare [Wed, 10 Oct 2012 21:43:51 +0000 (08:43 +1100)]
hwmon: Add missing inclusions of <linux/jiffies.h>
Many hwmon drivers use jiffies but omit the inclusion of the header
file. Fix that, and also fix one driver which was including the header
file but didn't need it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Luca Tettamanti <kronos.it@gmail.com>
Cc: Marc Hulsman <m.hulsman@tudelft.nl>
Cc: Rudolf Marek <r.marek@assembler.cz>
Peter Meerwald [Wed, 10 Oct 2012 21:43:51 +0000 (08:43 +1100)]
hwmon: Fix spelling of Celsius
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Oleksij Rempel [Wed, 10 Oct 2012 21:43:50 +0000 (08:43 +1100)]
hwmon: Update Alexey Fisher's name
My name was change after migration.
Signed-off-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare [Wed, 10 Oct 2012 21:43:47 +0000 (08:43 +1100)]
i2c-stub: Move to drivers/i2c
Move the i2c-stub driver to drivers/i2c, to match the Kconfig entry.
This is less confusing that way.
I also fixed all checkpatch warnings and errors.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Huewe <peterhuewe@gmx.de>
David S. Miller [Wed, 10 Oct 2012 15:59:54 +0000 (11:59 -0400)]
Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Here is a batch of fixes intended for 3.7...
Amitkumar Karwar provides a couple of mwifiex fixes to correctly
report some reason codes for certain connection failures. He also
provides a fix to cleanup after a scanning failure. Bing Zhao rounds
that out with another mwifiex scanning fix.
Daniel Golle gives us a fix for a copy/paste error in rt2x00.
Felix Fietkau brings a couple of ath9k fixes related to suspend/resume,
and a couple of fixes to prevent memory leaks in ath9k and mac80211.
Ronald Wahl sends a carl9170 fix for a sleep in softirq context.
Thomas Pedersen reorders some code to prevent drv_get_tsf from being
called while holding a spinlock, now that it can sleep.
Finally, Wei Yongjun prevents a NULL pointer dereference in the
ath5k driver.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
David Henningsson [Wed, 10 Oct 2012 14:32:09 +0000 (16:32 +0200)]
ALSA: hda - do not detect jack on internal speakers for Realtek
This caused the internal speaker to mute itself because it was
present, which happened after powersave.
It was found on Dell XPS 15 (L502x), ALC665.
Reported-by: Da Fox <da.fox.mail@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Brian Norris [Wed, 26 Sep 2012 23:15:27 +0000 (16:15 -0700)]
mtd: fsl_elbc_nand: remove unnecessary badblock_pattern
Since the introduction of nand_create_default_bbt_descr() (now known as
nand_create_badblock_pattern()) in
commit
58373ff0afff4cc8ac40608872995f4d87eb72ec
nand_chip.badblock_pattern will be dynamically calculated to the same
1-byte-length pattern that is required by fsl_elbc_nand. This custom
badblock_pattern is no longer needed, then, and its removal may help
facilitate further nand_bbt.c/nand_base.c cleanup in the future (one
down, many to go?)
Anyway, with nand_bbt.c fixed, this effectively reverts:
commit
452db2724351ff3d9416a183a7955e00ab4e6ab4
[MTD] [NAND] fsl_elbc_nand: fix OOB workability for large page NAND chips
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Sachin Kamat [Tue, 25 Sep 2012 09:57:13 +0000 (15:27 +0530)]
mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
The pointer returned by kzalloc should be tested for NULL
to avoid potential NULL pointer dereference later. Incorrect
pointer was being tested for NULL. Bug introduced by commit
fbcf62a3
(mtd: physmap_of: move parse_obsolete_partitions to become separate
parser).
This patch fixes this bug.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: stable@vger.kernel.org [3.2+]
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Matthieu CASTET [Tue, 25 Sep 2012 09:05:27 +0000 (11:05 +0200)]
mtd: m25p80: add support for the windbond w25q256 chip
Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Ralf Baechle [Wed, 10 Oct 2012 14:24:14 +0000 (16:24 +0200)]
MIPS: Remove unused empty_bad_pmd_table[] declaration.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Marek Vasut [Mon, 24 Sep 2012 01:39:39 +0000 (03:39 +0200)]
mtd: m25p80: Make fast read configurable via DT
Add DT property "m25p,fast-read" that signalises the particular
chip supports "fast read" opcode.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Konrad Rzeszutek Wilk [Wed, 10 Oct 2012 13:30:43 +0000 (09:30 -0400)]
Merge branch 'stable/for-linus-3.7-uapi' into linux-next
* stable/for-linus-3.7-uapi:
UAPI: (Scripted) Disintegrate include/xen
Konrad Rzeszutek Wilk [Wed, 10 Oct 2012 13:30:21 +0000 (09:30 -0400)]
Merge commit '
9e2d8656f5e8aa214e66b462680cf86b210b74a8 ' into linux-next
* commit '
9e2d8656f5e8aa214e66b462680cf86b210b74a8 ': (8865 commits)
sparc64: Support transparent huge pages.
mm: thp: Use more portable PMD clearing sequenece in zap_huge_pmd().
mm: Add and use update_mmu_cache_pmd() in transparent huge page code.
sparc64: Document PGD and PMD layout.
sparc64: Eliminate PTE table memory wastage.
sparc64: Halve the size of PTE tables
sparc64: Only support 4MB huge pages and 8KB base pages.
memory-hotplug: suppress "Trying to free nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning
mm: memcg: clean up mm_match_cgroup() signature
mm: document PageHuge somewhat
mm: use %pK for /proc/vmallocinfo
mm, thp: fix mlock statistics
mm, thp: fix mapped pages avoiding unevictable list on mlock
memory-hotplug: update memory block's state and notify userspace
memory-hotplug: preparation to notify memory block's state at memory hot remove
mm: avoid section mismatch warning for memblock_type_name
make GFP_NOTRACK definition unconditional
cma: decrease cc.nr_migratepages after reclaiming pagelist
CMA: migrate mlocked pages
kpageflags: fix wrong KPF_THP on non-huge compound pages
...
Konrad Rzeszutek Wilk [Wed, 10 Oct 2012 13:30:07 +0000 (09:30 -0400)]
Merge branch 'stable/for-linus-3.7' into linux-next
* stable/for-linus-3.7:
xen pv-on-hvm: add pfn_is_ram helper for kdump
xen/hvc: handle backend CLOSED without CLOSING
Konrad Rzeszutek Wilk [Wed, 10 Oct 2012 13:25:16 +0000 (09:25 -0400)]
Merge tag 'disintegrate-xen-
20121009 ' of git://git.infradead.org/users/dhowells/linux-headers into stable/for-linus-3.7-uapi
UAPI Disintegration 2012-10-09
* tag 'disintegrate-xen-
20121009 ' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: (Scripted) Disintegrate include/xen
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Vikram Narayanan [Sun, 23 Sep 2012 09:48:32 +0000 (15:18 +0530)]
mtd: gpmi-nand: make debug prints more clear
Make the error messages more debugging friendly
Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Shmulik Ladkani [Sun, 23 Sep 2012 07:52:29 +0000 (09:52 +0200)]
mtd: cmdlinepart: Simplify parse_cmdline_partitions
Simply 'parse_cmdline_partitions': the outer loop iterating over
'partitions' is actually a search loop, it does not execute the inner
loop for each partition, only for the matched partition.
Let's break when search is successful, and move all inner code (relevant
only for the matched partition) outside of the outer loop.
Resulting code is much more readable, and makes the indent level sane.
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Duncan Roe [Wed, 10 Oct 2012 12:19:50 +0000 (14:19 +0200)]
ALSA: hda - Fix missing beep on ASUS X43U notebook
Signed-off-by: Duncan Roe <duncan_roe@acslink.net.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Stephen Rothwell [Wed, 10 Oct 2012 12:04:16 +0000 (23:04 +1100)]
Revert "memory-hotplug: suppress "Trying to free nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning"
This reverts commit
d760afd4d2570653891f94e13b848e97150dc5a6 .