diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:03:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-03 14:03:07 +1000 |
| commit | 2d6a3334e62d820b63baa7dd3aa07b936e0660d8 (patch) | |
| tree | 9d442fde12cfa97585be286bfbf6f2b696a4b0d8 /drivers/input/misc/adxl34x-i2c.c | |
| parent | 39249800cca4731f82671055c1553dd21df0943d (diff) | |
| parent | 12b15e83289bc7cf2ec9a342412e0c955beeb395 (diff) | |
Merge remote branch 'devicetree/next-devicetree'
Conflicts:
arch/microblaze/kernel/Makefile
Diffstat (limited to 'drivers/input/misc/adxl34x-i2c.c')
0 files changed, 0 insertions, 0 deletions