aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:56:23 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:56:23 -0800
commit36177ba655c238e33400cc2837a28720b62784bd (patch)
treec285738397f0272f1e0e973c5e6a53b2e8da74b1 /arch/sparc
parent2152f8536668a957ea3214735b4761e7b22ef7d8 (diff)
parent056755f4d73d49b4adcbb8ecdaf75138cf166bd3 (diff)
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
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions