diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 02:52:05 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-31 02:52:05 +0100 |
| commit | 285dee7ff4fb4b32838694d4378f4aa938cf5b43 (patch) | |
| tree | fa15cd1b385898f01ead4649712f6e4fbcd055cd /Documentation/rfkill.txt | |
| parent | Merge branch 'next-s5pv210' into for-next-new (diff) | |
| parent | Merge branch 'dev/s5pv310-irq' into next-s5pv310 (diff) | |
| download | linux-285dee7ff4fb4b32838694d4378f4aa938cf5b43.tar.xz linux-285dee7ff4fb4b32838694d4378f4aa938cf5b43.zip | |
Merge branch 'next-s5pv310' into for-next
Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
Diffstat (limited to 'Documentation/rfkill.txt')
0 files changed, 0 insertions, 0 deletions