Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/kernel-parameters.txt
	arch/sh/include/asm/elf.h

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 5771a83a43f0..5ba0aee0eb2f 100644
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -30,6 +30,7 @@ struct bootcmd
 
 #define BOOT_CMD_RESP_OK                0x0001
 #define BOOT_CMD_RESP_FAIL              0x0000
+#define BOOT_CMD_RESP_NOT_SUPPORTED     0x0002
 
 struct bootcmdresp
 {
@@ -50,6 +51,10 @@ struct if_usb_card {
         uint8_t ep_in;
         uint8_t ep_out;
 
+        /* bootcmdresp == 0 means command is pending
+         * bootcmdresp < 0 means error
+         * bootcmdresp > 0 is a BOOT_CMD_RESP_* from firmware
+         */
         int8_t bootcmdresp;
 
         int ep_in_size;