| #
459d2a9f |
| 27-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
|
|
Revision tags: v3.7-rc7 |
|
| #
85146244 |
| 21-Nov-2012 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
|
| #
2054271b |
| 21-Nov-2012 |
Olof Johansson <olof@lixom.net> |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup s
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
show more ...
|
| #
3f6f1cd6 |
| 21-Nov-2012 |
Olof Johansson <olof@lixom.net> |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
show more ...
|
| #
a6366c51 |
| 20-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branches 'fix/arizona', 'fix/cs4271', 'fix/kirkwood' and 'fix/samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into tmp
|
| #
87af0b80 |
| 19-Nov-2012 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'for-linus' into for-next
Merge the recent HD-audio codec change for fixing recursive suspend
calls.
Conflicts:
sound/pci/hda/hda_codec.c
|
| #
80da549e |
| 19-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge tag 'v3.7-rc6' into asoc-wm2200
Linux 3.7-rc6
|
| #
24a118de |
| 19-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge tag 'v3.7-rc6' into asoc-arizona
Linux 3.7-rc6
Conflicts:
sound/soc/codecs/wm5102.c
|
| #
2bf81c8a |
| 16-Nov-2012 |
Al Viro <viro@zeniv.linux.org.uk> |
Merge branch 'arch-microblaze' into no-rebases
|
| #
98c4514f |
| 16-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc6 into char-misc-next
|
|
Revision tags: v3.7-rc6 |
|
| #
bac2f668 |
| 16-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX dt updates for 3.8
* tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6:
Add device tree file for the armadeus apf27
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX25: Add devicetree
ARM i.MX25: Add devicetree support
ARM i.MX25: Add missing clock gates
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
| #
db2f95de |
| 16-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX SoC updates
based on imx-multiplatform branch.
* tag 'imx-soc'
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX SoC updates
based on imx-multiplatform branch.
* tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX51 babbage: Add display support
ARM i.MX6: Add IPU support
ARM i.MX51: Add IPU support
ARM i.MX53: Add IPU support
ARM i.MX5: switch IPU clk support to devicetree bindings
ARM i.MX6: fix ldb_di_sel mux
ARM i.MX51: setup MIPI during startup
mx2_camera: Fix regression caused by clock conversion
ARM: clk-imx27: Add missing clock for mx2-camera
ARM i.MX27: Fix low reference clock path
ARM: dts: imx27-3ds: Remove local watchdog inclusion
watchdog: Support imx watchdog on SOC_IMX53
ARM: mach-imx: Support for DryIce RTC in i.MX53
ARM : i.MX27 : split code for allocation of ressources of camera and eMMA
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
| #
57260e40 |
| 16-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX fixes for 3.7-rc
* tag 'imx-fixes-rc' of git://git.pengutroni
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <s.hauer@pengutronix.de>:
ARM i.MX fixes for 3.7-rc
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: ehci: fix host power mask bit
ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
| #
da63d20b |
| 15-Nov-2012 |
Grant Likely <grant.likely@secretlab.ca> |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
|
| #
ecb48c33 |
| 14-Nov-2012 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp
|
| #
ecdca043 |
| 14-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc5 into driver-core-next
|
| #
54d5f88f |
| 14-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
|
| #
a7a0aaa1 |
| 14-Nov-2012 |
Ingo Molnar <mingo@kernel.org> |
Merge tag 'v3.7-rc5' into sched/core
Merge Linux 3.7-rc5, to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
| #
b240add6 |
| 13-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc5 into usb-next
This pulls in the 3.7-rc5 branch into usb-next
|
| #
6097a074 |
| 13-Nov-2012 |
Catalin Marinas <catalin.marinas@arm.com> |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
|
| #
b5932cc8 |
| 12-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'cleanups/dma' into next/cleanup
Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:
Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") re
Merge branch 'cleanups/dma' into next/cleanup
Separate patches from Marek Szyprowski <m.szyprowski@samsung.com>:
Commit e9da6e9905e639b0 ("ARM: dma-mapping: remove custom consistent dma
region") replaced custom consistent memory handling, so setting
consistent dma memory size is not longer required. This patch series
cleans sub-architecture platform code to remove all calls to the
obsolated init_consistent_dma_size() function and finally removes the
init_consistent_dma_size() stub itself.
* cleanups/dma:
ARM: at91: remove obsoleted init_consistent_dma_size()
ARM: u300: remove obsoleted init_consistent_dma_size()
ARM: dma-mapping: remove init_consistent_dma_size() stub
ARM: shmobile: remove obsoleted init_consistent_dma_size()
ARM: davinci: remove obsoleted init_consistent_dma_size()
ARM: samsung: remove obsoleted init_consistent_dma_size()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
show more ...
|
| #
6214b54c |
| 13-Nov-2012 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
show more ...
|
| #
889cf721 |
| 12-Nov-2012 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'next/boards2' into next/soc2
Dependency for more Renesas soc changes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
| #
f8b06550 |
| 11-Nov-2012 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 3.7-rc5 into staging-next
|
|
Revision tags: v3.7-rc5 |
|
| #
d4185bbf |
| 10-Nov-2012 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug f
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net. Based upon a conflict resolution
patch posted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|