| #
95ee46aa |
| 15-Aug-2010 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
|
| #
7d72e6fa |
| 13-Aug-2010 |
Chris Metcalf <cmetcalf@tilera.com> |
Merge branch 'master' into for-linus
|
| #
f46a6804 |
| 12-Aug-2010 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:
de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
| #
87da3235 |
| 11-Aug-2010 |
Joe Perches <joe@perches.com> |
drivers/scsi/ch.c: don't use vprintk as macro
It's an exported symbol of kernel/printk.c
Rename vprintk and dprintk macros to more common VPRINTK and DPRINTK
Add do { } while(0) around macros
Add l
drivers/scsi/ch.c: don't use vprintk as macro
It's an exported symbol of kernel/printk.c
Rename vprintk and dprintk macros to more common VPRINTK and DPRINTK
Add do { } while(0) around macros
Add level to VPRINTK so KERN_CONT can be used a couple of times.
Signed-off-by: Joe Perches <joe@perches.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
85bc081f |
| 11-Aug-2010 |
Julia Lawall <julia@diku.dk> |
drivers/scsi/aic94xx/aic94xx_init.c: correct the size argument to kmalloc
In each case, the destination of the allocation has type struct **, so the
elements of the array should have pointer type, n
drivers/scsi/aic94xx/aic94xx_init.c: correct the size argument to kmalloc
In each case, the destination of the allocation has type struct **, so the
elements of the array should have pointer type, not structure type.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@disable sizeof_type_expr@
type T;
T **x;
@@
x =
<+...sizeof(
- T
+ *x
)...+>
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Rolf Eike Beer <eike-kernel@sf-tec.de>
Cc: Joe Perches <joe@perches.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
11e4afb4 |
| 06-Aug-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branches 'gemini' and 'misc' into devel
|
| #
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
|
| #
e37c83c0 |
| 31-May-2010 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge commit 'v2.6.35-rc1' into for-2.6.36
|
| #
19fdb9ee |
| 21-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 ...
|
| #
0b28330e |
| 17-May-2010 |
Dan Williams <dan.j.williams@intel.com> |
Merge branch 'ioat' into dmaengine
|
| #
ac1d426e |
| 17-May-2010 |
Russell King <rmk+kernel@arm.linux.org.uk> |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
|
| #
b65b3489 |
| 16-May-2010 |
Henrique de Moraes Holschuh <hmh@hmh.eng.br> |
Merge mainline (v2.6.34-rc7)
|
| #
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.
|
| #
0ae28a35 |
| 10-May-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/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
pat
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
show more ...
|
| #
dbb6be6d |
| 10-May-2010 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
| #
d7be0ce6 |
| 08-May-2010 |
H. Peter Anvin <hpa@zytor.com> |
Merge commit 'v2.6.34-rc6' into x86/cpu
|
| #
0ffbe269 |
| 06-May-2010 |
James Morris <jmorris@namei.org> |
Merge branch 'master' into next
|
| #
5306293c |
| 04-May-2010 |
J. Bruce Fields <bfields@citi.umich.edu> |
Merge commit 'v2.6.34-rc6'
Conflicts:
fs/nfsd/nfs4callback.c
|
| #
d6d53cbc |
| 03-May-2010 |
Jiri Kosina <jkosina@suse.cz> |
Merge branch 'hid-suspend' into picolcd
|
| #
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
|
| #
f9221fd8 |
| 30-Apr-2010 |
Joel Becker <joel.becker@oracle.com> |
Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes
|
| #
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.
|
| #
d9c5841e |
| 29-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 ...
|