summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/futex.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-19 10:05:27 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-19 10:05:27 -0700
commit1b3fa22e0234d613df967445cd34807e10fa54fa (patch)
tree8891a1d1f5d10416d32f15dbcee098b9572d079f /arch/x86/include/asm/futex.h
parenta05f8f86e49749f239c49257db1d3ac6f474f0dd (diff)
parent1ad94ffef22c0a6e2ee6ba90a800c32fd29ffa1f (diff)
Merge tag 'extcon-next-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes: Update extcon for v3.15 This patchset fix minor issue. The extcon-palmas/gpio use SIMPLE_DEV_PM_OPS macro instead of legacy method. OF helper function of extcon move in extcon core to remove separate of_extcon.c and change the name of OF helper function as following because previous function name is complicated and ambiguous naming. - of_extcon_get_extcon_dev() -> extcon_get_edev_by_phandle()
Diffstat (limited to 'arch/x86/include/asm/futex.h')
0 files changed, 0 insertions, 0 deletions