tree 5a78dc694217c446b09362913195ad7afcf38fdb
parent 53846a21c1766326bb14ce8ab6e997a0c120675d
parent 0fdf109676d1eda4ff8199a9a3ee3f11c555c1b3
author Linus Torvalds <torvalds@g5.osdl.org> 1143307239 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143307239 -0800

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6:
  [PATCH] aoe [3/3]: update version to 22
  [PATCH] aoe [2/3]: don't request ATA device ID on ATA error
  [PATCH] aoe [1/3]: support multiple AoE listeners
  [PATCH] aoe: do not stop retransmit timer when device goes down
  [PATCH] aoe [8/8]: update driver version number
  [PATCH] aoe [7/8]: update driver compatibility string
  [PATCH] aoe [6/8]: update device information on last close
  [PATCH] aoe [5/8]: allow network interface migration on packet retransmit
  [PATCH] aoe [4/8]: use less confusing driver name
  [PATCH] aoe [3/8]: increase allowed outstanding packets
  [PATCH] aoe [2/8]: support dynamic resizing of AoE devices
  [PATCH] aoe [1/8]: zero packet data after skb allocation