diff --git a/[refs] b/[refs] index 6c97f9f6d51f..3b172ff09357 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7175c61cc6b8e701441e79ef048c11ae97293463 +refs/heads/master: 59fb1b9f5d9910c2eb97107dd0eb7e3bce8f0dde diff --git a/trunk/include/linux/ipmi.h b/trunk/include/linux/ipmi.h index 1487e7906bbd..1f9f56e28851 100644 --- a/trunk/include/linux/ipmi.h +++ b/trunk/include/linux/ipmi.h @@ -35,10 +35,6 @@ #include - -/* - * The in-kernel interface. - */ #include #include diff --git a/trunk/include/uapi/linux/ipmi.h b/trunk/include/uapi/linux/ipmi.h index 33fbc99b3812..7b26a62e5707 100644 --- a/trunk/include/uapi/linux/ipmi.h +++ b/trunk/include/uapi/linux/ipmi.h @@ -59,15 +59,7 @@ * if it becomes full and it is queried once a second to see if * anything is in it. Incoming commands to the driver will get * delivered as commands. - * - * This driver provides two main interfaces: one for in-kernel - * applications and another for userland applications. The - * capabilities are basically the same for both interface, although - * the interfaces are somewhat different. The stuff in the - * #ifdef __KERNEL__ below is the in-kernel interface. The userland - * interface is defined later in the file. */ - - + */ /* * This is an overlay for all the address types, so it's easy to