Merge branch 'upstream' into bugfix-video

Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 11 insertions, 21 deletions

diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c
index f8cd641dfc82..54563ad8aeb1 100644
--- a/net/lapb/lapb_timer.c
+++ b/net/lapb/lapb_timer.c
@@ -14,6 +14,8 @@
  *      LAPB 002        Jonathan Naylor New timer architecture.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -105,21 +107,17 @@ static void lapb_t1timer_expiry(unsigned long param)
                                 lapb_clear_queues(lapb);
                                 lapb->state = LAPB_STATE_0;
                                 lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
-#if LAPB_DEBUG > 0
-                                printk(KERN_DEBUG "lapb: (%p) S1 -> S0\n", lapb->dev);
-#endif
+                                lapb_dbg(0, "(%p) S1 -> S0\n", lapb->dev);
                                 return;
                         } else {
                                 lapb->n2count++;
                                 if (lapb->mode & LAPB_EXTENDED) {
-#if LAPB_DEBUG > 1
-                                        printk(KERN_DEBUG "lapb: (%p) S1 TX SABME(1)\n", lapb->dev);
-#endif
+                                        lapb_dbg(1, "(%p) S1 TX SABME(1)\n",
+                                                 lapb->dev);
                                         lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
                                 } else {
-#if LAPB_DEBUG > 1
-                                        printk(KERN_DEBUG "lapb: (%p) S1 TX SABM(1)\n", lapb->dev);
-#endif
+                                        lapb_dbg(1, "(%p) S1 TX SABM(1)\n",
+                                                 lapb->dev);
                                         lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
                                 }
                         }
@@ -133,15 +131,11 @@ static void lapb_t1timer_expiry(unsigned long param)
                                 lapb_clear_queues(lapb);
                                 lapb->state = LAPB_STATE_0;
                                 lapb_disconnect_confirmation(lapb, LAPB_TIMEDOUT);
-#if LAPB_DEBUG > 0
-                                printk(KERN_DEBUG "lapb: (%p) S2 -> S0\n", lapb->dev);
-#endif
+                                lapb_dbg(0, "(%p) S2 -> S0\n", lapb->dev);
                                 return;
                         } else {
                                 lapb->n2count++;
-#if LAPB_DEBUG > 1
-                                printk(KERN_DEBUG "lapb: (%p) S2 TX DISC(1)\n", lapb->dev);
-#endif
+                                lapb_dbg(1, "(%p) S2 TX DISC(1)\n", lapb->dev);
                                 lapb_send_control(lapb, LAPB_DISC, LAPB_POLLON, LAPB_COMMAND);
                         }
                         break;
@@ -155,9 +149,7 @@ static void lapb_t1timer_expiry(unsigned long param)
                                 lapb->state = LAPB_STATE_0;
                                 lapb_stop_t2timer(lapb);
                                 lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
-#if LAPB_DEBUG > 0
-                                printk(KERN_DEBUG "lapb: (%p) S3 -> S0\n", lapb->dev);
-#endif
+                                lapb_dbg(0, "(%p) S3 -> S0\n", lapb->dev);
                                 return;
                         } else {
                                 lapb->n2count++;
@@ -173,9 +165,7 @@ static void lapb_t1timer_expiry(unsigned long param)
                                 lapb_clear_queues(lapb);
                                 lapb->state = LAPB_STATE_0;
                                 lapb_disconnect_indication(lapb, LAPB_TIMEDOUT);
-#if LAPB_DEBUG > 0
-                                printk(KERN_DEBUG "lapb: (%p) S4 -> S0\n", lapb->dev);
-#endif
+                                lapb_dbg(0, "(%p) S4 -> S0\n", lapb->dev);
                                 return;
                         } else {
                                 lapb->n2count++;