#
56012808 |
| 15-Feb-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Conflicts: arch/arm/Makefile
|
Revision tags: v2.6.33-rc8 |
|
#
0482e3c6 |
| 10-Feb-2010 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
|
#
84abd88a |
| 10-Feb-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge remote branch 'linus/master' into x86/bootmem
|
#
6d3e0907 |
| 08-Feb-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Revision tags: v2.6.33-rc7 |
|
#
e1a0bdd8 |
| 02-Feb-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'master' into upstream
Conflicts: drivers/hid/hid-ids.h
|
#
fb7899b1 |
| 02-Feb-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc6' into secretlab/next-spi
|
#
ab386128 |
| 01-Feb-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
|
#
9d3f1881 |
| 01-Feb-2010 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
Revision tags: v2.6.33-rc6 |
|
#
0ada0a73 |
| 28-Jan-2010 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
|
#
be8cde8b |
| 27-Jan-2010 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] aic79xx: check for non-NULL scb in ahd_han
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree [SCSI] zfcp: Set hardware timeout as requested by BSG request. [SCSI] zfcp: Introduce bsg_timeout callback. [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout [SCSI] zfcp: add missing compat ptr conversion [SCSI] zfcp: Fix linebreak in hba trace [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request [SCSI] qla2xxx: Update version number to 8.03.01-k10. [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure. [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment. [SCSI] qla2xxx: Correct FCP2 recovery handling. [SCSI] scsi_lib: Fix bug in completion of bidi commands [SCSI] mptsas: Fix issue with chain pools allocation on katmai [SCSI] aacraid: fix File System going into read-only mode [SCSI] lpfc: fix file permissions
show more ...
|
Revision tags: v2.6.33-rc5 |
|
#
2457552d |
| 17-Jan-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
#
5a3fb308 |
| 13-Jan-2010 |
Christof Schmitt <christof.schmitt@de.ibm.com> |
[SCSI] zfcp: Fix linebreak in hba trace
Advance the correct pointer when inserting the linebreak for the HBA trace. It was missing in the output since the pointer to the output buffer was never adva
[SCSI] zfcp: Fix linebreak in hba trace
Advance the correct pointer when inserting the linebreak for the HBA trace. It was missing in the output since the pointer to the output buffer was never advanced, and the linebreak character was overwritten later.
Reviewed-by: Swen Schillig <swen@vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
show more ...
|
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
|
Revision tags: v2.6.33-rc3 |
|
#
32032df6 |
| 04-Jan-2010 |
Tejun Heo <tj@kernel.org> |
Merge branch 'master' into percpu
Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h
|
#
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 |
|
#
de8853bc |
| 21-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge remote branch 'alsa/fixes' into fix/hda
|
#
4b4f887f |
| 21-Dec-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' into sh/hw-breakpoints
|
Revision tags: v2.6.33-rc1 |
|
#
7547a3e8 |
| 15-Dec-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'linus' into next
|
#
709334c8 |
| 15-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
|
#
b8937162 |
| 14-Dec-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'next/isa' into topic/misc
|
#
cc0104e8 |
| 14-Dec-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into tracing/urgent
Conflicts: kernel/trace/trace_kprobe.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
#
bc7ecbcb |
| 13-Dec-2009 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
|
#
50170656 |
| 11-Dec-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/net/tcp.h
|
#
5c6baba8 |
| 11-Dec-2009 |
H. Peter Anvin <hpa@zytor.com> |
Merge commit 'linus/master' into x86/urgent
|
#
e3f4e1cb |
| 11-Dec-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|