diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 15:48:52 -0400 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /arch/alpha/kernel/osf_sys.c | |
| parent | 61282f37927143e45b03153f3e7b48d6b702147a (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'arch/alpha/kernel/osf_sys.c')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 01e8715e26d9..49ee3193477a 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <asm/fpu.h> | 40 | #include <asm/fpu.h> |
| 41 | #include <asm/io.h> | 41 | #include <asm/io.h> |
| 42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 43 | #include <asm/system.h> | ||
| 44 | #include <asm/sysinfo.h> | 43 | #include <asm/sysinfo.h> |
| 45 | #include <asm/thread_info.h> | 44 | #include <asm/thread_info.h> |
| 46 | #include <asm/hwrpb.h> | 45 | #include <asm/hwrpb.h> |