| #
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-rc4, v2.6.36-rc3, v2.6.36-rc2, v2.6.36-rc1 |
|
| #
7a996d3a |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
|
| #
772320e8 |
| 04-Aug-2010 |
Michal Marek <mmarek@suse.cz> |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
|
|
Revision tags: v2.6.35, v2.6.35-rc6, v2.6.35-rc5, v2.6.35-rc4, v2.6.35-rc3, v2.6.35-rc2, v2.6.35-rc1 |
|
| #
19fdb9ee |
| 22-May-2010 |
NeilBrown <neilb@suse.de> |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
show more ...
|
| #
b65b3489 |
| 17-May-2010 |
Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
Merge mainline (v2.6.34-rc7)
|
|
Revision tags: v2.6.34 |
|
| #
a9aa1d02 |
| 12-May-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc7' into perf/nmi
Merge reason: catch up with latest softlockup detector changes.
|
|
Revision tags: v2.6.34-rc7 |
|
| #
53ba4f2f |
| 03-May-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc6' into core/locking
|
| #
df2071bd |
| 03-May-2010 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
868c522b |
| 30-Apr-2010 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.
|
|
Revision tags: v2.6.34-rc6 |
|
| #
d9c5841e |
| 30-Apr-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/
Merge branch 'x86/asm' into x86/atomic
Merge reason:
Conflict between LOCK_PREFIX_HERE and relative alternatives
pointers
Resolved Conflicts:
arch/x86/include/asm/alternative.h
arch/x86/kernel/alternative.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
show more ...
|
| #
a36bf32e |
| 23-Apr-2010 |
Robert Richter <robert.richter@amd.com> |
Merge commit 'v2.6.34-rc5' into oprofile/core
|
|
Revision tags: 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
|
| #
87e8b821 |
| 04-Apr-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
c9494727 |
| 02-Apr-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: update to latest upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
3595be77 |
| 31-Mar-2010 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'v2.6.34-rc2' into drm-linus
|
| #
d25d6fa1 |
| 30-Mar-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
|
Revision tags: v2.6.34-rc3 |
|
| #
329f9052 |
| 26-Mar-2010 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch w
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/nand/sh_flctl.c
Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
show more ...
|
| #
2fb20b61 |
| 22-Mar-2010 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/misc' into topic/usb
|
|
Revision tags: v2.6.34-rc2 |
|
| #
b4b7a4ef |
| 19-Mar-2010 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
|
| #
4961e02f |
| 16-Mar-2010 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
ec28dcc6 |
| 15-Mar-2010 |
Len Brown <len.brown@intel.com> |
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'vi
Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release
show more ...
|
| #
fad837c1 |
| 10-Mar-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.34-rc1' into for-2.6.35
|
| #
d28c145d |
| 10-Mar-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/driver-core' into sh/clkfwk
|
| #
e739cf1d |
| 09-Mar-2010 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
|
| #
548b8416 |
| 09-Mar-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts:
tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|