diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 15:10:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 15:10:38 +0200 |
| commit | d21872b3683ff37f73c68993749a6e6aeeaed265 (patch) | |
| tree | 0a84ae436325d6e646fe987516fb6bfccfff8a1c /drivers/net/enic/vnic_rq.h | |
| parent | Remove ARM default configurations which duplicate omap3_defconfig (diff) | |
| parent | omap: mailbox: reorganize headers (diff) | |
| download | linux-d21872b3683ff37f73c68993749a6e6aeeaed265.tar.xz linux-d21872b3683ff37f73c68993749a6e6aeeaed265.zip | |
Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus
Conflicts:
arch/arm/mach-omap1/devices.c
Diffstat (limited to 'drivers/net/enic/vnic_rq.h')
0 files changed, 0 insertions, 0 deletions