diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 +0000 |
| commit | 1b1c7409b75a8b62906b78b84c8469002072b738 (patch) | |
| tree | 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b /include/linux/async.h | |
| parent | Merge branches 'fixes' and 'mmci' into for-linus (diff) | |
| parent | ARM: add SCHED_HRTICK config option (diff) | |
| download | linux-dev-1b1c7409b75a8b62906b78b84c8469002072b738.tar.xz linux-dev-1b1c7409b75a8b62906b78b84c8469002072b738.zip | |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/include/asm/memory.h
Diffstat (limited to 'include/linux/async.h')
0 files changed, 0 insertions, 0 deletions