| #
6e1bd1ab |
| 01-Nov-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.37' into for-2.6.38
|
|
Revision tags: v2.6.37-rc1 |
|
| #
b74b953b |
| 28-Oct-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
|
|
Revision tags: v2.6.36 |
|
| #
fa251f89 |
| 19-Oct-2010 |
Jens Axboe <jaxboe@fusionio.com> |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
|
| #
23beab76 |
| 18-Oct-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel
|
|
Revision tags: v2.6.36-rc8 |
|
| #
ce0ecc8a |
| 14-Oct-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
3d8a1a6a |
| 13-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
|
| #
4783f393 |
| 13-Oct-2010 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge remote branch 'kumar/merge' into next
|
| #
37eca0d6 |
| 12-Oct-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into core/locking
Reason: Pull in the semaphore related changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
239060b9 |
| 12-Oct-2010 |
Michal Marek <mmarek@suse.cz> |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
|
| #
ad0f7cfa |
| 11-Oct-2010 |
Robert Richter <robert.richter@amd.com> |
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
|
| #
153db80f |
| 08-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc7' into core/memblock
Merge reason: Update from -rc3 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
d4f8f217 |
| 07-Oct-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
|
|
Revision tags: v2.6.36-rc7 |
|
| #
ef70fcc0 |
| 01-Oct-2010 |
Robert Richter <robert.richter@amd.com> |
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
|
|
Revision tags: v2.6.36-rc6 |
|
| #
73e6d6c6 |
| 24-Sep-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
|
| #
4a445f29 |
| 24-Sep-2010 |
Dave Airlie <airlied@redhat.com> |
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
|
| #
cf84fd96 |
| 21-Sep-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.36-rc5' into sched/core
Merge reason: Pick up the latest fixes in -rc5.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
e9e5f8e8 |
| 21-Sep-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
|
|
Revision tags: v2.6.36-rc5 |
|
| #
c88739b3 |
| 20-Sep-2010 |
J. Bruce Fields <bfields@redhat.com> |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
|
| #
c91925db |
| 16-Sep-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/hda' into topic/hda
|
| #
3aabae7d |
| 15-Sep-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
|
| #
f3fbba6e |
| 14-Sep-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/misc' into topic/misc
|
| #
9277bf4b |
| 13-Sep-2010 |
Chris Wilson <chris@chris-wilson.co.uk> |
Merge remote branch 'linus' into drm-intel-fixes
|
|
Revision tags: v2.6.36-rc4 |
|
| #
e548833d |
| 10-Sep-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
|
| #
de9ea203 |
| 09-Sep-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'origin'
|
| #
e199e613 |
| 09-Sep-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|