|
Revision tags: v2.6.39 |
|
| #
f0e939ae |
| 10-May-2011 |
Anton Blanchard <anton@samba.org> |
powerpc/pseries: Print corrupt r3 in FWNMI code
I have a report of an FWNMI with an r3 value that we think is
corrupt, but since we don't print r3 we have no idea what was
wrong with it.
Signed-off
powerpc/pseries: Print corrupt r3 in FWNMI code
I have a report of an FWNMI with an r3 value that we think is
corrupt, but since we don't print r3 we have no idea what was
wrong with it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
show more ...
|
| #
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 |
|
| #
476eb491 |
| 04-May-2011 |
Grant Likely <grant.likely@secretlab.ca> |
powerpc/irq: Stop exporting irq_map
First step in eliminating irq_map[] table entirely
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
|
Revision tags: v2.6.39-rc6, v2.6.39-rc5, v2.6.39-rc4, v2.6.39-rc3, v2.6.39-rc2 |
|
| #
f94f3cb3 |
| 03-Apr-2011 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.39' into for-2.6.40
|
|
Revision tags: 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 |
|
| #
1cc26bad |
| 08-Mar-2011 |
James Morris <jmorris@namei.org> |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
|
|
Revision tags: 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 |
|
| #
0a9d59a2 |
| 15-Feb-2011 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into for-next
|
| #
b214b7bb |
| 14-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.38-rc4' into spi/next
|
| #
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 ...
|
| #
c170093d |
| 13-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'devicetree/merge' into spi/merge
|
| #
f19693a1 |
| 11-Feb-2011 |
Sascha Hauer <s.hauer@pengutronix.de> |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Revision tags: v2.6.38-rc4 |
|
| #
c64eae9a |
| 04-Feb-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.38-rc3' into devicetree/next
|
| #
949c3676 |
| 02-Feb-2011 |
Greg Kroah-Hartman <gregkh@suse.de> |
Staging: Merge branch 'staging-next' into 2.6.38-rc3
This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
drivers/staging/brcm80211
Staging: Merge branch 'staging-next' into 2.6.38-rc3
This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
show more ...
|
| #
8104a477 |
| 02-Feb-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
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
|
| #
6b620478 |
| 26-Jan-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
|
| #
bdd92c9a |
| 23-Jan-2011 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge important suspend and resume regression fixes and resolve the
small conflict.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
|
| #
5bdc22a5 |
| 24-Jan-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
|
| #
e92427b2 |
| 24-Jan-2011 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|