diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-03-16 20:59:01 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-03-16 20:59:01 +0000 |
| commit | ead9a638c8f7a4f6471a130c854afafeccbb0824 (patch) | |
| tree | b35b8551f9ec08e8d32a9c41bc994b019f939a39 /arch/arm/include/asm/pgalloc.h | |
| parent | db811ca0f48578f9940f49f284ac81e336b264ad (diff) | |
| parent | 0724d46417545aa3035d88fb8885dffe68817a8c (diff) | |
| parent | a8da7fecb6010222fe495cc2b4330b99bca20c61 (diff) | |
Merge branches 'for-2639/i2c/i2c-tegra', 'for-2639/i2c/i2c-mpc' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-1