Merge branch 'x86/cpufeature' into x86/cache

Browse source

Resolve the cpu/scattered conflict.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

...

This commit is contained in:

Thomas Gleixner 2016-11-16 14:19:34 +01:00

parent f410770293 47bdf3378d

commit 7ce7f35b33

925 changed files with 10470 additions and 6995 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/uapi/linux/ethtool.h

View file

2

include/uapi/linux/rtnetlink.h

View file

6

include/uapi/sound/asoc.h

View file