Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-08-26 10:43:55 -07:00

parent 5770a3fb5f 8a549f8b58

commit 1ef708ea44

2 changed files with 7 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

arch/ia64/include/asm/io.h

View file

1

arch/ia64/kernel/smpboot.c

View file