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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
  [IPV6] ADDRLABEL: Fix double free on label deletion.
  [PPP]: Sparse warning fixes.
  [IPV4] fib_trie: remove unneeded NULL check
  [IPV4] fib_trie: More whitespace cleanup.
  [NET_SCHED]: Use nla_policy for attribute validation in ematches
  [NET_SCHED]: Use nla_policy for attribute validation in actions
  [NET_SCHED]: Use nla_policy for attribute validation in classifiers
  [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
  [NET_SCHED]: sch_api: introduce constant for rate table size
  [NET_SCHED]: Use typeful attribute parsing helpers
  [NET_SCHED]: Use typeful attribute construction helpers
  [NET_SCHED]: Use NLA_PUT_STRING for string dumping
  [NET_SCHED]: Use nla_nest_start/nla_nest_end
  [NET_SCHED]: Propagate nla_parse return value
  [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
  [NET_SCHED]: act_api: use nlmsg_parse
  [NET_SCHED]: act_api: fix netlink API conversion bug
  [NET_SCHED]: sch_netem: use nla_parse_nested_compat
  [NET_SCHED]: sch_atm: fix format string warning
  [NETNS]: Add namespace for ICMP replying code.
  ...

diff --combined include/linux/Kbuild
index ad99ce9f916960063e521d05017dace2f551f79f,bc33a5c87d64cc86ae0f3e61fa879ffe51494f55..27b9350052b46dd7ed8a848174f3d4a26e490eca
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -1,4 -1,5 +1,5 @@@
  header-y += byteorder/
+ header-y += can/
  header-y += dvb/
  header-y += hdlc/
  header-y += isdn/
@@@ -34,12 -35,14 +35,13 @@@ header-y += atmsap.
  header-y += atmsvc.h
  header-y += atm_zatm.h
  header-y += auto_fs4.h
 -header-y += auxvec.h
  header-y += ax25.h
  header-y += b1lli.h
  header-y += baycom.h
  header-y += bfs_fs.h
  header-y += blkpg.h
  header-y += bpqether.h
+ header-y += can.h
  header-y += cdk.h
  header-y += chio.h
  header-y += coda_psdev.h
@@@ -72,7 -75,7 +74,7 @@@ header-y += gen_stats.
  header-y += gigaset_dev.h
  header-y += hdsmart.h
  header-y += hysdn_if.h
 -header-y += i2c-dev.h
 +header-y += i2o-dev.h
  header-y += i8k.h
  header-y += if_arcnet.h
  header-y += if_bonding.h
@@@ -157,6 -160,7 +159,6 @@@ header-y += veth.
  header-y += video_decoder.h
  header-y += video_encoder.h
  header-y += videotext.h
 -header-y += vt.h
  header-y += x25.h
  
  unifdef-y += acct.h
@@@ -171,7 -175,6 +173,7 @@@ unifdef-y += atm.
  unifdef-y += atm_tcp.h
  unifdef-y += audit.h
  unifdef-y += auto_fs.h
 +unifdef-y += auxvec.h
  unifdef-y += binfmts.h
  unifdef-y += capability.h
  unifdef-y += capi.h
@@@ -213,7 -216,7 +215,7 @@@ unifdef-y += hdreg.
  unifdef-y += hiddev.h
  unifdef-y += hpet.h
  unifdef-y += i2c.h
 -unifdef-y += i2o-dev.h
 +unifdef-y += i2c-dev.h
  unifdef-y += icmp.h
  unifdef-y += icmpv6.h
  unifdef-y += if_addr.h
@@@ -228,7 -231,6 +230,6 @@@ unifdef-y += if_ltalk.
  unifdef-y += if_link.h
  unifdef-y += if_pppol2tp.h
  unifdef-y += if_pppox.h
- unifdef-y += if_shaper.h
  unifdef-y += if_tr.h
  unifdef-y += if_tun.h
  unifdef-y += if_vlan.h
@@@ -348,7 -350,6 +349,7 @@@ unifdef-y += videodev.
  unifdef-y += virtio_config.h
  unifdef-y += virtio_blk.h
  unifdef-y += virtio_net.h
 +unifdef-y += vt.h
  unifdef-y += wait.h
  unifdef-y += wanrouter.h
  unifdef-y += watchdog.h