diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:43:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:43:55 -0400 |
commit | 1ef708ea449e5eab2780020ec79485db80937833 (patch) | |
tree | abf5f3fca27aba1c517e9fe02c9381aee4775720 /drivers/net/hp100.h | |
parent | 5770a3fb5f8544d40ae03b010318345cdd05d662 (diff) | |
parent | 8a549f8b581db95fec1e2d86ff857594fcfcd9db (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] Fix __{in,out}s{w,l} to handle unaligned data
[IA64] Fix ia64 build failure when CONFIG_SFC=m
Diffstat (limited to 'drivers/net/hp100.h')
0 files changed, 0 insertions, 0 deletions