Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] refresh config files
  [IA64] put kdump_find_rsvd_region in __init
  [IA64] Remove sparse warning from unwind code
  [IA64] add missing syscall trace clear
  [IA64] Cleanup in crash.c
  [IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
  [IA64] pci_get_legacy_ide_irq should return irq (not GSI)
  [IA64] whitespace fixes for include/asm-ia64/sal.h
  [IA64] Cache error recovery
  [IA64] Proper handling of TLB errors from duplicate itr.d dropins

1 files changed, 3 insertions, 2 deletions

diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index d000689d9142..46cadf5aaac5 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -847,12 +847,13 @@ extern int ia64_sal_oemcall_reentrant(struct ia64_sal_retval *, u64, u64, u64,
  */
 struct sal_to_os_boot {
         u64 rr[8];              /* Region Registers */
-        u64     br[6];          /* br0: return addr into SAL boot rendez routine */
+        u64 br[6];              /* br0:
+                                 * return addr into SAL boot rendez routine */
         u64 gr1;                /* SAL:GP */
         u64 gr12;               /* SAL:SP */
         u64 gr13;               /* SAL: Task Pointer */
         u64 fpsr;
-        u64     pfs;
+        u64 pfs;
         u64 rnat;
         u64 unat;
         u64 bspstore;