| #
7f50548a |
| 26-Dec-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.33-rc2' into for-2.6.33
|
|
Revision tags: v2.6.33-rc2 |
|
| #
f80ca163 |
| 22-Dec-2009 |
Dan Williams <dan.j.williams@intel.com> |
Merge branch 'ioat' into fixes
|
| #
de8853bc |
| 21-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge remote branch 'alsa/fixes' into fix/hda
|
|
Revision tags: v2.6.33-rc1 |
|
| #
559300bc |
| 14-Dec-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
|
| #
ec208491 |
| 08-Dec-2009 |
David Woodhouse <David.Woodhouse@intel.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.
|
| #
f3d607c6 |
| 07-Dec-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/urgent
Merge reason: we want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
6548698f |
| 07-Dec-2009 |
Frederic Weisbecker <fweisbec@gmail.com> |
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchm
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.
show more ...
|
| #
64357ed4 |
| 06-Dec-2009 |
Rafael J. Wysocki <rjw@sisk.pl> |
Merge branch 'master' into for-linus
|
| #
79598324 |
| 04-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/core-change' into for-linus
|
| #
5cb2faa6 |
| 04-Dec-2009 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'pending-misc' (early part) into devel
|
| #
a6c872af |
| 03-Dec-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
220d0b1d |
| 03-Dec-2009 |
Jens Axboe <jens.axboe@oracle.com> |
Merge branch 'master' into for-2.6.33
|
| #
46783203 |
| 03-Dec-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.32' into next
|
| #
c84d6efd |
| 03-Dec-2009 |
James Morris <jmorris@macbook.(none)> |
Merge branch 'master' into next
|
|
Revision tags: v2.6.32 |
|
| #
b00615d1 |
| 01-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/pcm-dma-fix' into topic/core-change
|
| #
83863243 |
| 01-Dec-2009 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
16bc67ed |
| 26-Nov-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: Pick up fixes that did not make it into .32.0
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
2cfcadde |
| 23-Nov-2009 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.32-rc8'
|
| #
9b8b317d |
| 23-Nov-2009 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge commit 'v2.6.32-rc8' into HEAD
|
|
Revision tags: v2.6.32-rc8 |
|
| #
3505d1a9 |
| 19-Nov-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/stagin
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
show more ...
|
| #
260af562 |
| 17-Nov-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
| #
a7b63425 |
| 17-Nov-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'perf/core' into perf/probes
Resolved merge conflict in tools/perf/Makefile
Merge reason: we want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
bb9074ff |
| 17-Nov-2009 |
Eric W. Biederman <ebiederm@xmission.com> |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
|
| #
99f4c9de |
| 17-Nov-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.32-rc7' into core/iommu
Merge reason: Add fixes we'll depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
39dc78b6 |
| 15-Nov-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.32-rc7' into perf/core
Merge reason: pick up perf fixlets
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|