Revision tags: v3.6-rc6 |
|
#
0f81bd43 |
| 09-Sep-2012 |
Russell King <rmk+kernel@arm.linux.org.uk> |
ARM: Dove: allow PCI to be disabled
Allow PCI support for Dove to be disabled. Some platforms do not have anything connected to the PCIe ports, so requiring PCI support to be built into the kernel
ARM: Dove: allow PCI to be disabled
Allow PCI support for Dove to be disabled. Some platforms do not have anything connected to the PCIe ports, so requiring PCI support to be built into the kernel just wastes space, and presents a lot more config options than are necessary.
However, select USB_ARCH_HAS_EHCI so that we can still have EHCI support.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
show more ...
|
Revision tags: v3.6-rc5, v3.6-rc4, v3.6-rc3, v3.6-rc2, v3.6-rc1, v3.5, v3.5-rc7, v3.5-rc6, v3.5-rc5, v3.5-rc4, v3.5-rc3, v3.5-rc2, v3.5-rc1, v3.4, v3.4-rc7, v3.4-rc6, v3.4-rc5, v3.4-rc4, v3.4-rc3, v3.4-rc2, v3.4-rc1, v3.3, v3.3-rc7, v3.3-rc6, v3.3-rc5, v3.3-rc4, v3.3-rc3, v3.3-rc2, v3.3-rc1, v3.2, v3.2-rc7, v3.2-rc6, v3.2-rc5, v3.2-rc4, v3.2-rc3, v3.2-rc2, v3.2-rc1, v3.1, v3.1-rc10, v3.1-rc9, v3.1-rc8, v3.1-rc7, v3.1-rc6, v3.1-rc5, v3.1-rc4, v3.1-rc3, v3.1-rc2, v3.1-rc1, v3.0, v3.0-rc7, v3.0-rc6, v3.0-rc5, v3.0-rc4, v3.0-rc3, v3.0-rc2, v3.0-rc1, v2.6.39 |
|
#
020abf03 |
| 10-May-2011 |
Stefan Richter <stefanr@s5r6.in-berlin.de> |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and sound/firewire/.
|
Revision tags: v2.6.39-rc7, v2.6.39-rc6, v2.6.39-rc5, v2.6.39-rc4, v2.6.39-rc3, v2.6.39-rc2, v2.6.39-rc1 |
|
#
97eb3f24 |
| 19-Mar-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
Revision tags: v2.6.38 |
|
#
2d8ad871 |
| 09-Mar-2011 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.38-rc1' into kbuild/packaging
|
Revision tags: v2.6.38-rc8, v2.6.38-rc7 |
|
#
6fae9c25 |
| 01-Mar-2011 |
Jens Axboe <jaxboe@fusionio.com> |
Merge commit 'v2.6.38-rc6' into for-2.6.39/core
Conflicts: block/cfq-iosched.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
#
e11d57ca |
| 24-Feb-2011 |
Ben Skeggs <bskeggs@redhat.com> |
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
|
#
695884fb |
| 22-Feb-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39.
Signed
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
show more ...
|
Revision tags: v2.6.38-rc6, v2.6.38-rc5 |
|
#
d2137d5a |
| 14-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/bootmem
Conflicts: arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this dependent fix from Yinghai:
e6d2e2b2b1
Merge branch 'linus' into x86/bootmem
Conflicts: arch/x86/mm/numa_64.c
Merge reason: fix the conflict, update to latest -rc and pick up this dependent fix from Yinghai:
e6d2e2b2b1e1: memblock: don't adjust size in memblock_find_base()
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
Revision tags: v2.6.38-rc4 |
|
#
a1f3d4bb |
| 01-Feb-2011 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.38-rc3' into next
|
Revision tags: v2.6.38-rc3 |
|
#
f97b12cc |
| 27-Jan-2011 |
Thomas Gleixner <tglx@linutronix.de> |
Merge commit 'v2.6.38-rc2' into core/locking
Reason: Update to mainline before adding the locking cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
e8cdfb05 |
| 26-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branches 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh-latest
|
Revision tags: v2.6.38-rc2 |
|
#
a1926d17 |
| 19-Jan-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.38' into for-2.6.39
|
Revision tags: v2.6.38-rc1 |
|
#
f652f6c5 |
| 16-Jan-2011 |
Nicholas Bellinger <nab@linux-iscsi.org> |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
|
#
0134e89c |
| 14-Jan-2011 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts: net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
|
#
f43dc23d |
| 13-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h
show more ...
|
#
fee1cc08 |
| 13-Jan-2011 |
Simon Horman <horms@verge.net.au> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
|
#
56dbed12 |
| 13-Jan-2011 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into idle-test
|
#
acc6f112 |
| 10-Jan-2011 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: fs/cifs/dir.c
|
#
d2e7ad19 |
| 09-Jan-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
Conflicts: security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au> Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off
Merge branch 'master' into next
Conflicts: security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au> Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
show more ...
|
#
5e93c6b4 |
| 07-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
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@linux-sh.org>
|
#
3c0cb7c3 |
| 07-Jan-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
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 DM
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 ...
show more ...
|
#
404a02cb |
| 06-Jan-2011 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel-stable' into devel
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
|
Revision tags: v2.6.37, v2.6.37-rc8, v2.6.37-rc7 |
|
#
9326845f |
| 18-Dec-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
|
Revision tags: v2.6.37-rc6, v2.6.37-rc5, v2.6.37-rc4, v2.6.37-rc3, v2.6.37-rc2 |
|
#
5af244fd |
| 15-Nov-2010 |
Mike Rapoport <mike@compulab.co.il> |
[ARM] Dove: add support for multi-purpose pins configuration
Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic
[ARM] Dove: add support for multi-purpose pins configuration
Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
show more ...
|
#
7f51439a |
| 16-Nov-2010 |
Konstantin Sinyuk <kostyas@compulab.co.il> |
[ARM] Dove: add support for CM-A510 machine.
This patch adds support for CM-A510 machine
Signed-off-by: Konstantin Sinyuk <kostyas@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
[ARM] Dove: add support for CM-A510 machine.
This patch adds support for CM-A510 machine
Signed-off-by: Konstantin Sinyuk <kostyas@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Reviewed-by: Saeed Bishara <saeed@marvell.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
show more ...
|