diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-22 10:19:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-22 10:19:30 +0200 |
| commit | eff430de53be6f3328c3eebe93755f1ecf499e37 (patch) | |
| tree | c8e5ae958fe3e6656b4e96c83bbda17e649321a2 /arch/um/include/asm/bug.h | |
| parent | 9cbdb702092a2d82f909312f4ec3eeded77bb82e (diff) | |
| parent | 91e8549bde9e5cc88c5a2e8c8114389279e240b5 (diff) | |
| download | kernel_samsung_espresso10-eff430de53be6f3328c3eebe93755f1ecf499e37.zip kernel_samsung_espresso10-eff430de53be6f3328c3eebe93755f1ecf499e37.tar.gz kernel_samsung_espresso10-eff430de53be6f3328c3eebe93755f1ecf499e37.tar.bz2 | |
Merge branch 'linus' into perf/core
Merge reason: Pick up upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um/include/asm/bug.h')
| -rw-r--r-- | arch/um/include/asm/bug.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/um/include/asm/bug.h b/arch/um/include/asm/bug.h new file mode 100644 index 0000000..9e33b86 --- /dev/null +++ b/arch/um/include/asm/bug.h @@ -0,0 +1,6 @@ +#ifndef __UM_BUG_H +#define __UM_BUG_H + +#include <asm-generic/bug.h> + +#endif |