diff options
author | Olof Johansson <olof@lixom.net> | 2012-07-01 00:27:52 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-07-01 00:27:52 +0200 |
commit | 5d5474df64d49564f297d9259932452ea64b745d (patch) | |
tree | 6aafc16d8a264082a72bb5d150a6ad8ffb097aa0 /net/netlabel/netlabel_cipso_v4.h | |
parent | ARM: imx6q: fix suspend regression caused by common clk migration (diff) | |
parent | ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry (diff) | |
download | linux-5d5474df64d49564f297d9259932452ea64b745d.tar.xz linux-5d5474df64d49564f297d9259932452ea64b745d.zip |
Merge branch 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.5-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix EXYNOS_DEV_DMA Kconfig entry
ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping
ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.h')
0 files changed, 0 insertions, 0 deletions