diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 13:08:05 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 13:08:18 (GMT) |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /drivers/block/swim3.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
| download | linux-fsl-qoriq-e060c38434b2caa78efe7cedaff4191040b65a15.tar.xz | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'drivers/block/swim3.c')
| -rw-r--r-- | drivers/block/swim3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 773bfa7..ae3e167 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1184,6 +1184,7 @@ static struct of_device_id swim3_match[] = { .compatible = "swim3" }, + { /* end of list */ } }; static struct macio_driver swim3_driver = |