Merge remote branch 'gcl/next' into next

diff --combined Documentation/kernel-parameters.txt
index 69bb6a9,8b61c93..e51fbd8
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -403,10 -403,6 +403,10 @@@ and is between 256 and 4096 characters
        bttv.pll=       See Documentation/video4linux/bttv/Insmod-options
        bttv.tuner=     and Documentation/video4linux/bttv/CARDLIST
  
 +      bulk_remove=off [PPC]  This parameter disables the use of the pSeries
 +                      firmware feature for flushing multiple hpte entries
 +                      at a time.
 +
        c101=           [NET] Moxa C101 synchronous serial card
  
        cachesize=      [BUGS=X86-32] Override level 2 CPU cache size detection.
@@@ -1494,10 -1490,6 +1494,10 @@@
        mtdparts=       [MTD]
                        See drivers/mtd/cmdlinepart.c.
  
 +      multitce=off    [PPC]  This parameter disables the use of the pSeries
 +                      firmware feature for updating multiple TCE entries
 +                      at a time.
 +
        onenand.bdry=   [HW,MTD] Flex-OneNAND Boundary Configuration
  
                        Format: [die0_boundary][,die0_lock][,die1_boundary][,die1_lock]
@@@ -2183,11 -2175,6 +2183,6 @@@
        reset_devices   [KNL] Force drivers to reset the underlying device
                        during initialization.
  
-       resource_alloc_from_bottom
-                       Allocate new resources from the beginning of available
-                       space, not the end.  If you need to use this, please
-                       report a bug.
- 
        resume=         [SWSUSP]
                        Specify the partition device for software suspend