From 470c584796b1f3d51052f57189301ff85eb2715b Mon Sep 17 00:00:00 2001
From: Vitaliy Ivanov <vitalivanov@gmail.com>
Date: Mon, 27 Jun 2011 19:07:08 +0300
Subject: [PATCH] --- yaml --- r: 258859 b: refs/heads/master c:
 e1f91f82b8bb031fe1b7731fb3666fa68c97fd38 h: refs/heads/master i:   258857:
 8ffd18e213c91b0e508006504d2d0055b6c1c97d   258855:
 29f04b6eb06888d2b58b9ebe2456078573c31cc4 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/device.h  | 1 -
 trunk/include/linux/hrtimer.h | 1 +
 trunk/include/net/sock.h      | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d428773c9bf9..4a812e017148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d364b601163841c24287540ae3548d19a0d2932e
+refs/heads/master: e1f91f82b8bb031fe1b7731fb3666fa68c97fd38
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index c66111affca9..5056cf8d935f 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -530,7 +530,6 @@ struct device_dma_parameters {
  * @dma_mem:	Internal for coherent mem override.
  * @archdata:	For arch-specific additions.
  * @of_node:	Associated device tree node.
- * @of_match:	Matching of_device_id from driver.
  * @devt:	For creating the sysfs "dev".
  * @devres_lock: Spinlock to protect the resource of the device.
  * @devres_head: The resources list of the device.
diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h
index 51932e5acf7c..fd0dc30c9f15 100644
--- a/trunk/include/linux/hrtimer.h
+++ b/trunk/include/linux/hrtimer.h
@@ -135,6 +135,7 @@ struct hrtimer_sleeper {
  * @cpu_base:		per cpu clock base
  * @index:		clock type index for per_cpu support when moving a
  *			timer to a base on another cpu.
+ * @clockid:		clock id for per_cpu support
  * @active:		red black tree root node for the active timers
  * @resolution:		the resolution of the clock, in nanoseconds
  * @get_time:		function to retrieve the current time of the clock
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index f2046e404a61..c0b938cb4b1a 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -178,7 +178,6 @@ struct sock_common {
   *	@sk_dst_cache: destination cache
   *	@sk_dst_lock: destination cache lock
   *	@sk_policy: flow policy
-  *	@sk_rmem_alloc: receive queue bytes committed
   *	@sk_receive_queue: incoming packets
   *	@sk_wmem_alloc: transmit queue bytes committed
   *	@sk_write_queue: Packet sending queue