diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 02:26:28 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 02:26:28 +0400 |
commit | 36bc45e219f48b5ec45c5aa34bc13dbe80e10c10 (patch) | |
tree | fa1ed8f19232dd08521146efaad44f254b4703f4 /block/cfq-iosched.c | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
parent | 70e5f5efcc933af55a3a18efdb3b2edd3eb510ec (diff) | |
parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
download | linux-36bc45e219f48b5ec45c5aa34bc13dbe80e10c10.tar.xz |
Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' into highbank/soc