Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e589501c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPICA: Update version to 20110112
  ACPICA: Update all ACPICA copyrights and signons to 2011
  ACPICA: Fix issues/fault with automatic "serialized" method support
  ACPICA: Debugger: Lock namespace for duration of a namespace dump
  ACPICA: Fix namespace race condition
  ACPICA: Fix memory leak in acpi_ev_asynch_execute_gpe_method().
parents 28e58ee8 8d5f0a64

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/

 *****************************************************************************/





/*

/*

 * Copyright (C) 2000 - 2010, Intel Corp.

 * Copyright (C) 2000 - 2011, Intel Corp.

 * All rights reserved.

 * All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acconfig.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/

 *****************************************************************************/





/*

/*

 * Copyright (C) 2000 - 2010, Intel Corp.

 * Copyright (C) 2000 - 2011, Intel Corp.

 * All rights reserved.

 * All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/

 *****************************************************************************/





/*

/*

 * Copyright (C) 2000 - 2010, Intel Corp.

 * Copyright (C) 2000 - 2011, Intel Corp.

 * All rights reserved.

 * All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acdispat.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/

 *****************************************************************************/





/*

/*

 * Copyright (C) 2000 - 2010, Intel Corp.

 * Copyright (C) 2000 - 2011, Intel Corp.

 * All rights reserved.

 * All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without

drivers/acpi/acpica/acevents.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *****************************************************************************/

 *****************************************************************************/





/*

/*

 * Copyright (C) 2000 - 2010, Intel Corp.

 * Copyright (C) 2000 - 2011, Intel Corp.

 * All rights reserved.

 * All rights reserved.

 *

 *

 * Redistribution and use in source and binary forms, with or without

 * Redistribution and use in source and binary forms, with or without