diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-28 15:26:17 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-28 15:26:17 -0700 |
commit | 9f84b6267ccde1bebe3f9cd40a91716b5ece5e20 (patch) | |
tree | b51dcf9fb1b7205ed8134ad1169e73719897163d /arch/x86/um/bug.c | |
parent | 719038de98bc8479b771c582a1e4a1e86079da22 (diff) | |
parent | 5f8c4218148822fde6eebbeefc34bd0a6061e031 (diff) | |
download | linux-9f84b6267ccde1bebe3f9cd40a91716b5ece5e20.tar.gz linux-9f84b6267ccde1bebe3f9cd40a91716b5ece5e20.tar.bz2 linux-9f84b6267ccde1bebe3f9cd40a91716b5ece5e20.zip |
Merge remote-tracking branch 'origin/x86/fpu' into queue/x86/cpu
Use the union of 3.10 x86/cpu and x86/fpu as baseline.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/um/bug.c')
0 files changed, 0 insertions, 0 deletions