diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /scripts/coccinelle/deref_null.cocci | |
parent | ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,parti... (diff) | |
parent | Merge branch 'devel-stable' into devel (diff) | |
download | linux-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.xz linux-0b019a41553a919965bb02d07d54e3e6c57a796d.zip |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'scripts/coccinelle/deref_null.cocci')
0 files changed, 0 insertions, 0 deletions