tree c285738397f0272f1e0e973c5e6a53b2e8da74b1
parent 2152f8536668a957ea3214735b4761e7b22ef7d8
parent 056755f4d73d49b4adcbb8ecdaf75138cf166bd3
author Linus Torvalds <torvalds@g5.osdl.org> 1143053783 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143053783 -0800

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TG3]: Bump driver version and reldate.
  [TG3]: Skip phy power down on some devices
  [TG3]: Fix SRAM access during tg3_init_one()
  [X25]: dte facilities 32 64 ioctl conversion
  [X25]: allow ITU-T DTE facilities for x25
  [X25]: fix kernel error message 64 bit kernel
  [X25]: ioctl conversion 32 bit user to 64 bit kernel
  [NET]: socket timestamp 32 bit handler for 64 bit kernel
  [NET]: allow 32 bit socket ioctl in 64 bit kernel
  [BLUETOOTH]: Return negative error constant