summaryrefslogtreecommitdiffstats
path: root/include/net/mac802154.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-23 08:10:25 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-23 08:10:25 +0100
commit320437af954cbe66478f1f5e8b34cb5a8d072191 (patch)
tree179940f87f305533380abbec5c0c5bd8a6147dbc /include/net/mac802154.h
parent90338325a9cab8ff93359963e3a37be1c8907389 (diff)
parent8c071b0f19dfa230335d22ce56a8fab5bd20cedc (diff)
downloadop-kernel-dev-320437af954cbe66478f1f5e8b34cb5a8d072191.zip
op-kernel-dev-320437af954cbe66478f1f5e8b34cb5a8d072191.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "Several last minute bug fixes. Two of them are on the larger side for rc7, the dasd format patch for older storage devices and the store-clock-fast patch where we have been to optimistic with an optimization" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/time: correct use of store clock fast s390/vmlogrdr: fix array access in vmlogrdr_open() s390/compat,signal: fix return value of copy_siginfo_(to|from)_user32() s390/dasd: check for availability of prefix command during format s390/mm,kvm: fix software dirty bits vs. kvm for old machines
Diffstat (limited to 'include/net/mac802154.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud