| #
d6363844 |
| 04-Nov-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
|
| #
de0a5345 |
| 02-Nov-2011 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'for-linus' of git://github.com/richardweinberger/linux
* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
um: fix ubd cow size
um: Fix kmalloc argument order i
Merge branch 'for-linus' of git://github.com/richardweinberger/linux
* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
um: fix ubd cow size
um: Fix kmalloc argument order in um/vdso/vma.c
um: switch to use of drivers/Kconfig
UserModeLinux-HOWTO.txt: fix a typo
UserModeLinux-HOWTO.txt: remove ^H characters
um: we need sys/user.h only on i386
um: merge delay_{32,64}.c
um: distribute exports to where exported stuff is defined
um: kill system-um.h
um: generic ftrace.h will do...
um: segment.h is x86-only and needed only there
um: asm/pda.h is not needed anymore
um: hw_irq.h can go generic as well
um: switch to generic-y
um: clean Kconfig up a bit
um: a couple of missing dependencies...
um: kill useless argument of free_chan() and free_one_chan()
um: unify ptrace_user.h
um: unify KSTK_...
um: fix gcov build breakage
...
show more ...
|
| #
5c48b108 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: take arch/um/sys-x86 to arch/x86/um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
7bbe7204 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: merge Makefile-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
6582b7f7 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: merge arch/um/sys-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
858ba944 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: merge arch/um/sys-{i386,x86_64}/shared
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
27f85f12 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: merge arch/um/sys-{i386,x86_64}/asm
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
9e636452 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: get rid of kern_constants.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
4de1c5f6 |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: take user_constants.h to include/generated
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
4d45db9c |
| 18-Aug-2011 |
Al Viro <viro@ftp.linux.org.uk> |
um: switch to -idirafter, get saner kern_constants.h out of that
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
|
| #
6a8d2e2b |
| 30-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branches 'msm/dt', 'imx/dt' and 'at91/dt' into next/dt
|
| #
d4d9781d |
| 28-Oct-2011 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
|
| #
a853ba8d |
| 24-Oct-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge commit 'v3.1' into spi/next
|
| #
91056a63 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
|
| #
995a0605 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'at91/trng' into next/driver
|
| #
29ea3596 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx/devel' into next/devel
|
| #
b4cbb8a4 |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
|
| #
1faca4ce |
| 20-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'samsung/devel' of git+ssh://git.linaro.org/home/arndbergmann/public_git/arm-soc into next/devel2
|
| #
5c04b426 |
| 19-Oct-2011 |
Jens Axboe <axboe@kernel.dk> |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
| #
017ed801 |
| 18-Oct-2011 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <ai
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
show more ...
|
| #
8eb41582 |
| 17-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'ep93xx/board' into next/board
|
| #
07aaae44 |
| 15-Oct-2011 |
Florian Tobias Schandinat <FlorianSchandinat@gmx.de> |
Merge commit 'v3.1-rc9' into fbdev-next
|
| #
8efc59ad |
| 07-Oct-2011 |
Arnd Bergmann <arnd@arndb.de> |
Merge branch 'sirf/cleanup' into next/cleanup
|
| #
9514a567 |
| 05-Oct-2011 |
Grant Likely <grant.likely@secretlab.ca> |
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next
|
| #
22f92bac |
| 04-Oct-2011 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|