Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

diff --cc Documentation/DocBook/Makefile
index e471bc466a7e1c68a3e526843e138d178d96fc05,9ebd1f00c6e7927349c62a931aed731efd95cb90..b2b6366bba5163628d7d4e4617921dda5d442d0f
--- 1/Documentation/DocBook/Makefile
--- 2/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -9,9 -9,10 +9,10 @@@
  DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
            kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
            procfs-guide.xml writing_usb_driver.xml networking.xml \
 -          kernel-api.xml filesystems.xml lsm.xml usb.xml \
 +          kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
            gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-           genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml
+           genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
+           mac80211.xml
  
  ###
  # The build process is as follows (targets):

diff --cc Documentation/feature-removal-schedule.txt
index 4b70622a8a914b900f2910779f52a90042797323,ee3cc8b8c84ed991967637684b7996fe5c72d898..af0e9393bf684d62c70afcaa1c620709fceebb86
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -203,16 -203,8 +203,8 @@@ Who:  linuxppc-dev@ozlabs.or
  
  ---------------------------
  
- What:   sk98lin network driver
- When:   Feburary 2008
- Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
-       replaced by the skge driver. 
- Who:    Stephen Hemminger <shemminger@linux-foundation.org>
- 
- ---------------------------
- 
  What: i386/x86_64 bzImage symlinks
 -When: April 2008
 +When: April 2010
  
  Why:  The i386/x86_64 merge provides a symlink to the old bzImage
        location so not yet updated user space tools, e.g. package

diff --cc MAINTAINERS
Simple merge

diff --cc arch/s390/defconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge