diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:16 +0100 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /kernel/hung_task.c | |
| parent | Merge branch 'misc' into devel (diff) | |
| parent | Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable (diff) | |
| download | linux-rng-7b70c4275f28702b76b273c8534c38f8313812e9.tar.xz linux-rng-7b70c4275f28702b76b273c8534c38f8313812e9.zip | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'kernel/hung_task.c')
0 files changed, 0 insertions, 0 deletions