diff options
author | 2016-04-13 08:58:32 -0700 | |
---|---|---|
committer | 2016-04-13 08:58:32 -0700 | |
commit | 5b523ff281b9f97ec75d526e2750381c6e8c9326 (patch) | |
tree | d473bf600d0cb70d7dfd0295533850506ddab0f4 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
parent | m68k/gpio: remove arch specific sysfs bus device (diff) | |
download | linux-dev-5b523ff281b9f97ec75d526e2750381c6e8c9326.tar.xz linux-dev-5b523ff281b9f97ec75d526e2750381c6e8c9326.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu/coldfire fix from Greg Ungerer:
"Only a single change that removes a local arch specific gpio bus sysfs
device that now clashes with the generic gpio bus sysfs device
interface"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k/gpio: remove arch specific sysfs bus device
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions