summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/intrinsics.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-17 23:45:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-17 23:45:02 +0100
commit6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch)
tree2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /arch/ia64/include/asm/intrinsics.h
parentStaging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtou... (diff)
parentLinux 3.14-rc3 (diff)
downloadlinux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.xz
linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.zip
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/include/asm/intrinsics.h')
0 files changed, 0 insertions, 0 deletions