#
055a1b8c |
| 02-Aug-2010 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'devel-misc' into omap-for-linus
|
#
78276271 |
| 02-Aug-2010 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
* 'drm-radeon-next' of ../drm-radeon-next: (333 commits) drm/radeon/kms: trivial code style fixes for audio drm/radeon: re
Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next
* 'drm-radeon-next' of ../drm-radeon-next: (333 commits) drm/radeon/kms: trivial code style fixes for audio drm/radeon: remove viewport transform from r6xx/r7xx blit emit drm/radeon: group r6xx/r7xx newly sequential blit state drm/radeon: reorder r6xx/r7xx blit state emit to make more regs sequential drm/radeon: r6xx/r7xx move vport clipping to a single packet drm/radeon: group r6xx/r7xx sequential blit state drm/radeon: remove duplicate state emit in r6xx/r7xx blit drm/radeon: add comments to r6xx/r7xx blit state drm/radeon/kms/r7xx: add workaround for hw issue with HDP flush drm/radeon/kms: remove rs4xx gart limit drm: radeon: fix sign bug drm/radeon/kms: check/restore sanity before doing anything else with GPU. drm/radeon: fall back to GTT if bo creation/validation in VRAM fails. drm/radeon/kms: add ioport register access drm/radeon/kms: enable HDMI audio on RS600/RS690/RS740 drm/radeon/kms: track audio engine state, do not use not setup timer drm/radeon/kms/r6xx+: add query for tile config (v2) drm/radeon/kms: fix CS alignment checking for tiling (v2) drm/radeon/kms: add tiling support to the cs checker for r6xx/r7xx drm/radeon/kms: Add crtc tiling setup support for evergreen ...
show more ...
|
#
d656ae53 |
| 02-Aug-2010 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
|
Revision tags: v2.6.35 |
|
#
7d50d07d |
| 28-Jul-2010 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge remote branch 'linus/master' into x86/cpu
|
#
4708ac49 |
| 27-Jul-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin' into misc
|
#
5ffdcd94 |
| 26-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into spi/test
|
#
4e4f62bf |
| 24-Jul-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts: arch/sparc/kernel/prom_64.c
|
Revision tags: v2.6.35-rc6 |
|
#
dca45ad8 |
| 21-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
9dcdbf7a |
| 21-Jul-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/core
Merge reason: Pick up the latest perf fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
14764b01 |
| 21-Jul-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.35-rc5 |
|
#
c2330e28 |
| 12-Jul-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6
* 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6: ARM: reduce defc
Merge branch 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6
* 'arm/defconfig/reduced-v2.6.35-rc1' of git://git.pengutronix.de/git/ukl/linux-2.6: ARM: reduce defconfigs
This is a big change, but results in no loss of information, despite us losing almost 200k lines:
177 files changed, 652 insertions(+), 194157 deletions(-)
and Grant Likely thinks powerpc can also use the same reduction technique.
The python script that did the reduction looks like this:
#! /usr/bin/env python # vim: set fileencoding=utf-8 : # Copyright (C) 2010 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
import re import subprocess import os import sys
# This prevents including a timestamp in the .config which makes comparing a # bit easier. os.environ['KCONFIG_NOTIMESTAMP'] = 'Yes, please'
# XXX: get these using getopt kernel_tree = '' # os.path.join(os.environ['HOME'], 'gsrc', 'linux-2.6') arch = 'arm' target = sys.argv[1] defconfig_src = os.path.join(kernel_tree, 'arch/%s/configs/%s' % (arch, target))
subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target]) origconfig = list(open('.config')) config = list(origconfig) config_size = os.stat('.config').st_size
i = 0
while i < len(config): print 'test for %r' % config[i] defconfig = open(defconfig_src, 'w') defconfig.writelines(config[:i]) defconfig.writelines(config[i + 1:]) defconfig.close() subprocess.check_call(['make', '-s', 'ARCH=%s' % arch, target]) if os.stat('.config').st_size == config_size and list(open('.config')) == origconfig: del config[i] else: i += 1
defconfig = open(defconfig_src, 'w') defconfig.writelines(config) defconfig.close()
which is pretty self-explanatory.
Acked-by: Nicolas Pitre <nico@fluxnic.net> Acked-by: Russell King <linux@arm.linux.org.uk> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
Revision tags: v2.6.35-rc4, v2.6.35-rc3 |
|
#
07a8c03f |
| 10-Jun-2010 |
Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
ARM: reduce defconfigs
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
Revision tags: v2.6.35-rc2, v2.6.35-rc1, v2.6.34, v2.6.34-rc7, v2.6.34-rc6, v2.6.34-rc5, v2.6.34-rc4 |
|
#
87d8a697 |
| 09-Apr-2010 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
Revision tags: v2.6.34-rc3, v2.6.34-rc2, v2.6.34-rc1 |
|
#
f790c0ca |
| 08-Mar-2010 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/linux-2.6
Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c
Signed-off-by: Patrick McHardy <k
Merge branch 'master' of /repos/git/linux-2.6
Conflicts: net/ipv4/netfilter/nf_nat_core.c net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_netlink.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
show more ...
|
#
35858adb |
| 01-Mar-2010 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
|
#
a7790532 |
| 26-Feb-2010 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
|
Revision tags: v2.6.33, v2.6.33-rc8 |
|
#
84abd88a |
| 11-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge remote branch 'linus/master' into x86/bootmem
|
#
9ab99d5a |
| 10-Feb-2010 |
Patrick McHardy <kaber@trash.net> |
Merge branch 'master' of /repos/git/net-next-2.6
Signed-off-by: Patrick McHardy <kaber@trash.net>
|
Revision tags: v2.6.33-rc7, v2.6.33-rc6 |
|
#
51c24aaa |
| 23-Jan-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
#
7755726f |
| 22-Jan-2010 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.33-rc5' into next
|
Revision tags: v2.6.33-rc5 |
|
#
2457552d |
| 17-Jan-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
Revision tags: v2.6.33-rc4 |
|
#
163849ea |
| 12-Jan-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.33' into for-2.6.34
|
#
a4ad68d5 |
| 08-Jan-2010 |
Jaroslav Kysela <perex@perex.cz> |
Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into devel
|
Revision tags: v2.6.33-rc3 |
|
#
32032df6 |
| 05-Jan-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h
|
#
15e7f8b9 |
| 25-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|