summaryrefslogtreecommitdiffstats
path: root/ipc/compat.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 00:02:54 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 00:02:54 -0800
commit5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (patch)
treec5aa57e70d901ae05b25e61387a351e6b0b2826b /ipc/compat.c
parent037db524a2015607031c70a7935153120601b908 (diff)
parent0a0d62857366d8a6531e7fed1c3ccdd9a2b5b40b (diff)
downloadop-kernel-dev-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.zip
op-kernel-dev-5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1.tar.gz
Merge branch 'for-linus' into next
Bring in changes to ads7846 to avoid mereg conflicts.
Diffstat (limited to 'ipc/compat.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud