diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 18:44:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-08 18:46:13 +1100 |
| commit | 3439e34f56f4bf62ef0dfb11998dbba60683ad25 (patch) | |
| tree | d22405035ec2863e73e2afa5e1c62c2fc6cae06f /drivers/spi/spi-mxs.c | |
| parent | e1e958029781a5f22a47807f9648ab9d221746f4 (diff) | |
| parent | 7c5598d4c8740214860372b6e6114f2675d68429 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
fs/anon_inodes.c
fs/autofs4/inode.c
include/linux/lglock.h
kernel/Makefile
scripts/bloat-o-meter
Diffstat (limited to 'drivers/spi/spi-mxs.c')
0 files changed, 0 insertions, 0 deletions