summaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-12 15:41:22 -0700
committerOlof Johansson <olof@lixom.net>2012-05-12 15:41:22 -0700
commit85d5c4a362add39f7491b38ed0160df1dcae1d2b (patch)
tree62cc791433225c64eddcfcf8f66c93e90ac7f0d1 /net/can
parentd2919c651e750a58c3dd8b0183ac1b2700cdc01d (diff)
parent28b874a8ba7aed5152dc426dde38239ce23d8b37 (diff)
Merge branch 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: fix ctrlbit for exynos5_clk_pdma1 ARM: EXYNOS: use s5p-timer for UniversalC210 board
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions