into nuts.ninka.net:/home/davem/src/BK/net-2.5

 NinjaSCSI-3R PCMCIA SCSI host adapter driver updated for the latest
kernel tree.

Intermezzo has some strange, broken code trying to deal with extended
attributes and and ACLs.  Fortunately the xattr code is hidden under
a config option that's never set, but the ACL code is enabled by
CONFIG_POSIX_ACL that's se by ext2/ext3 and jfs now.  Change it to
#if 0 to get intermezzo compiling again.

into home.transmeta.com:/home/torvalds/v2.5/linux

  Update sbp2scsi_biosparam() declaration to match sbp2.c
sbp2.c:
  C s/capacy/capacity/

into home.transmeta.com:/home/torvalds/v2.5/linux

Grrh, don't do last minute changes without retesting.

Adapt arch/alpha as well, other archs need to
o add LDFLAGS_BLOB to arch/$(ARCH)/Makefile
o add .init.ramfs to arch/$(ARCH)/vmlinux.lds.S

See arch/i386/{Makefile,vmlinux.lds.S} for guidance ;)

- Split out from bluesmoke.c into per-vendor files (Me)
  (If we were that way inclined, we could even make the
   per-vendor bits CONFIG_ options, but thats probably overkill)
- Fixes Kconfig markup. (Roman Zippel)
- P4 can use non-fatal background checker too. (Venkatesh Pallipadi)
- Don't clear MCA status info in case of non-recoverable if
  OS has failed in logging those, BIOS can still ahve a look at
  that info. (Venkatesh)
- We can init bank 0 on P4 (Zwane Mwaikambo)
- Compile away to nothing if CONFIG_X86_MCE=n
- Various other cleaning (Me)

From 2.4

This is used by the following Cyrix patch to handle buggy or spec tight
PIT stuff

Since we don't have mandatory mmap lock files we can lose this chunk

and clean up dependency rules (first "default" rule takes precedence)

- Implement IP_IPSEC_POLICY setsockopt
- Rework input policy checks to use it
- dst->child destruction is repaired
- Fix tunnel mode IP header building.

- Fix dst metric memcpy length.
- Iterator for walking skb sec_path goes in wrong direction.

The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

into home.transmeta.com:/home/torvalds/v2.5/linux