The following commit has been merged in the batman-adv/next branch: commit 4c6de2fedc321e17487b74547ad9f73f248faaac Merge: e6a04b1d3ff9d5af219b2fcaebe0ef04733d597c 62748b7bde84618f06b5c7a8733ae87776ec36c5 Author: David S. Miller davem@davemloft.net Date: Mon Aug 20 02:30:41 2012 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next

Peter P Waskiewicz Jr says:

==================== This series contains multiple updates to the ixgbe driver.

The following are changes since commit 02644a17457414f38e29f32d5c640b06d08fa092: sctp: fix bogus if statement in sctp_auth_recv_cid()

and are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ppwaskie/net-next master

Alexander Duyck (9): ixgbe: Remove code that was initializing Rx page offset ixgbe: combine ixgbe_add_rx_frag and ixgbe_can_reuse_page ixgbe: Only use double buffering if page size is less than 8K ixgbe: Have the CPU take ownership of the buffers sooner ixgbe: Make pull tail function separate from rest of cleanup_headers ixgbe: Copybreak sooner to avoid get_page/put_page and offset change overhead ixgbe: Make allocating skb and placing data in it a separate function ixgbe: Roll RSC code into non-EOP code ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor ====================

Signed-off-by: David S. Miller davem@davemloft.net