Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...

2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 7594f65800cf..4bc1c4178f50 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1406,7 +1406,7 @@ acpi_os_invalidate_address(
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SytemMemory
+                /* Only interference checks against SystemIO and SystemMemory
                    are needed */
                 res.start = address;
                 res.end = address + length - 1;
@@ -1458,7 +1458,7 @@ acpi_os_validate_address (
         switch (space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
         case ACPI_ADR_SPACE_SYSTEM_MEMORY:
-                /* Only interference checks against SystemIO and SytemMemory
+                /* Only interference checks against SystemIO and SystemMemory
                    are needed */
                 res = kzalloc(sizeof(struct acpi_res_list), GFP_KERNEL);
                 if (!res)
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ddc76787b842..f74d3b31e5c9 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -172,7 +172,6 @@ static int acpi_power_get_list_state(struct acpi_handle_list *list, int *state)
                 return -EINVAL;
 
         /* The state of the list is 'on' IFF all resources are 'on'. */
-        /* */
 
         for (i = 0; i < list->count; i++) {
                 /*