summaryrefslogtreecommitdiff
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:45:34 +0800
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-06-04 19:45:34 +0800
commit06c48e022c9737a840da15fd47c7df24dc5d5b9a (patch)
treeb4dfddbb2c074254d747ba28b4fd9e1229082247 /drivers/staging/Makefile
parent416f7ed72d4a115d473df16bab92b46c5d120ef1 (diff)
parent56bde254da35de0eea481035bfcd50dbec3ea22f (diff)
Merge topic branch 'st-mems-sensors' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/staging/Makefile')
0 files changed, 0 insertions, 0 deletions