diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 22:31:29 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 22:31:29 +0200 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /block | |
| parent | Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'sm... (diff) | |
| parent | ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE() (diff) | |
| download | linux-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.xz linux-33b9f582c5c1db515412cc7efff28f7d1779321f.zip | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions