diff options
author | 2013-09-04 10:49:39 +0200 | |
---|---|---|
committer | 2013-09-04 10:49:57 +0200 | |
commit | efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b (patch) | |
tree | 40024adbe77a3d660662e639fd765097133d648c /tools/perf/scripts/python/export-to-postgresql.py | |
parent | HID: battery: don't do DMA from stack (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
download | linux-dev-efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b.tar.xz linux-dev-efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b.zip |
Merge branch 'master' into for-3.12/upstream
Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions