summaryrefslogtreecommitdiff
path: root/drivers/hwmon/ibmaem.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-04 11:30:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-04 11:30:22 -0800
commit14c79092909a52b6fd6394b6ad5e7756c4f9565e (patch)
treec9ab2a50aa00c8888cc90006a0e012782b0ccc19 /drivers/hwmon/ibmaem.c
parent1b1050cdc5cdde43177b375b5f22dc070d45d8f8 (diff)
parenta01fece2e4185ac173abd16d10304d73d47ebf00 (diff)
Merge branch 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller: "The most important change is that we reduce L1_CACHE_BYTES to 16 bytes, for which a trivial patch for XPS in the network layer was needed. Then we wire up the sys_membarrier and userfaultfd syscalls and added two other small cleanups" * 'parisc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Change L1_CACHE_BYTES to 16 net/xps: Fix calculation of initial number of xps queues parisc: reduce syslog debug output parisc: serial/mux: Convert to uart_console_device instead of open-coded parisc: Wire up userfaultfd syscall parisc: allocate sys_membarrier system call number
Diffstat (limited to 'drivers/hwmon/ibmaem.c')
0 files changed, 0 insertions, 0 deletions