diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:46:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:46:01 -0700 |
| commit | 66f49739fe1591197364f2dad1b67b975e8f5e85 (patch) | |
| tree | 5c804af8a3789c0cdf319e27bad3005d6a471cdf /drivers/net/at1700.c | |
| parent | 0cdf6990e992902ae59cbc625d28cb41390f378e (diff) | |
| parent | 57e4acb3f63e1d3d74a75613eefde8b2d68164e3 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Un-break ia64 build
Diffstat (limited to 'drivers/net/at1700.c')
0 files changed, 0 insertions, 0 deletions