diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-02-22 21:54:12 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-22 21:54:12 +0300 |
| commit | 04aa67dec63b61c1a8b9b6d001262250f1a92130 (patch) | |
| tree | 7e0d2cfb30f904ffbd2ac39a055cd53034c873b7 /init/do_mounts_rd.c | |
| parent | 3b03b58dab847883e6b9a431558c7d8e43fa94c6 (diff) | |
| parent | 18a26892d62d2786c2b259ba4605ee10bba0ba13 (diff) | |
| download | linux-04aa67dec63b61c1a8b9b6d001262250f1a92130.tar.xz | |
Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
Conflicts:
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'init/do_mounts_rd.c')
0 files changed, 0 insertions, 0 deletions