diff options
| author | Tony Lindgren | 2011-02-23 21:06:28 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2011-02-23 21:06:28 +0100 |
| commit | 7cab8713b1ed0dab08ad6458f92a40b7ff4be619 (patch) | |
| tree | 8c95691ac2b5bdfc85efe417427b5903fa80450c /net/irda | |
| parent | Merge branches 'devel-cleanup', 'devel-omap4', 'devel-board' and 'devel-nand'... (diff) | |
| parent | OMAP2, 3: DSS2: board files: replace platform_device_register with omap_displ... (diff) | |
| download | kernel-qcow2-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.tar.gz kernel-qcow2-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.tar.xz kernel-qcow2-linux-7cab8713b1ed0dab08ad6458f92a40b7ff4be619.zip | |
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions